win32.mak: Make check for CR LF in Visual C++ 6.0 project files

Original commit message from CVS:
* win32.mak: (win32), (win32defs), (win32crlf):
Make check for CR LF in Visual C++ 6.0 project files
work, based on patch by David Schleef (#496722, #393626).

diff --git a/ChangeLog b/ChangeLog
index bf70f9b..13120bd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2007-12-17  Tim-Philipp Müller  <tim at centricular dot net>
 
+       * win32.mak: (win32), (win32defs), (win32crlf):
+         Make check for CR LF in Visual C++ 6.0 project files
+         work, based on patch by David Schleef (#496722, #393626).
+       
+2007-12-17  Tim-Philipp Müller  <tim at centricular dot net>
+
        * Makefile.am:
          Don't forget to dist the new win32.mak.
 

diff --git a/win32.mak b/win32.mak
index 4da4760..96b1085 100644 (file)
--- a/win32.mak
+++ b/win32.mak
@@ -1,21 +1,29 @@
 # various tests to make sure we dist the win32 stuff (for MSVC builds) right
 
+# the MANIFEST contains all win32 related files that should be disted
 win32 = $(shell cat $(top_srcdir)/win32/MANIFEST)
 
-# wildcard is apparently not portable to other makes
+# wildcard is apparently not portable to other makes, hence the use of find
+# these are library .def files with the symbols to export
 win32defs = $(shell find $(top_srcdir)/win32/common -name '*.def')
 
+# wildcard is apparently not portable to other makes, hence the use of find
+# these are files that need to be disted with CRLF line endings:
+win32crlf = $(shell find $(top_srcdir)/win32 -name '*.dsw' -o -name '*.dsp')
+
 win32-debug:
        @echo; \
        echo win32     = $(win32); \
        echo; \
        echo win32defs = $(win32defs); \
+       echo; \
+       echo win32crlf = $(win32crlf); \
        echo
 
-# FIXME: this doesn't seem to work right yet
 win32-check-crlf:
+       @echo Checking win32 files for CR LF line endings ...; \
        fail=0 ; \
-       for each in $(win32); do \
+       for each in $(win32crlf) ; do \
          if ! (file $$each | grep CRLF >/dev/null) ; then \
            echo $$each must be fixed to have CRLF line endings ; \
            fail=1; \
@@ -41,6 +49,6 @@ check-exports:
        done
 
 
-dist-hook: check-exports
+dist-hook: check-exports win32-check-crlf