Update source checking test and remove CRLF crap from makefiles.

caca/Makefile.am

@@ -119,3 +119,5 @@ if USE_COCOA
 driver_source += driver/cocoa.m
 endif
 
+echo-sources: ; echo $(SOURCES)
+

cxx/Makefile.am

@@ -1,48 +1,50 @@
-# $Id: Makefile.am 552 2006-04-13 16:10:16Z jylam $
-
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca
-
-EXTRA_DIST = libcaca++.vcproj libcaca++.def test-cxx.vcproj
-if USE_CXX
-pkgconfig_DATA = caca++.pc
-pkgconfigdir = $(libdir)/pkgconfig
-
-include_HEADERS = caca++.h
-lib_LTLIBRARIES = libcaca++.la
-endif
-
-libcaca___la_SOURCES = caca++.cpp caca++.h
-libcaca___la_LDFLAGS = -no-undefined -version-number @LT_VERSION@
-libcaca___la_LIBADD = ../caca/libcaca.la
-
-if USE_CXX
-noinst_PROGRAMS = cxxtest
-endif
-
-cxxtest_SOURCES = cxxtest.cpp
-cxxtest_LDADD = libcaca++.la ../caca/libcaca.la
-
-if USE_CXX
-install-exec-local:
-	$(mkinstalldirs) $(DESTDIR)$(libdir)
-	. libcaca++.la; \
-	for x in $$library_names; do \
-	  ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
-	done
-	ln -sf libcaca++.la $(DESTDIR)$(libdir)/libcucul++.la
-
-install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
-	ln -sf caca++.pc $(DESTDIR)$(pkgconfigdir)/cucul++.pc
-endif
-
-uninstall-local:
-	. libcaca++.la; \
-	for x in $$library_names; do \
-	  rm -f $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
-	done
-	rm -f $(DESTDIR)$(libdir)/libcucul++.la
-	rmdir $(DESTDIR)$(libdir) 2>/dev/null || true
-	rm -f $(DESTDIR)$(pkgconfigdir)/cucul++.pc
-	rmdir $(DESTDIR)$(pkgconfigdir) 2>/dev/null || true
-
+# $Id: Makefile.am 552 2006-04-13 16:10:16Z jylam $
+
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca
+
+EXTRA_DIST = libcaca++.vcproj libcaca++.def test-cxx.vcproj
+if USE_CXX
+pkgconfig_DATA = caca++.pc
+pkgconfigdir = $(libdir)/pkgconfig
+
+include_HEADERS = caca++.h
+lib_LTLIBRARIES = libcaca++.la
+endif
+
+libcaca___la_SOURCES = caca++.cpp caca++.h
+libcaca___la_LDFLAGS = -no-undefined -version-number @LT_VERSION@
+libcaca___la_LIBADD = ../caca/libcaca.la
+
+if USE_CXX
+noinst_PROGRAMS = cxxtest
+endif
+
+cxxtest_SOURCES = cxxtest.cpp
+cxxtest_LDADD = libcaca++.la ../caca/libcaca.la
+
+if USE_CXX
+install-exec-local:
+	$(mkinstalldirs) $(DESTDIR)$(libdir)
+	. libcaca++.la; \
+	for x in $$library_names; do \
+	  ln -sf $$x $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
+	done
+	ln -sf libcaca++.la $(DESTDIR)$(libdir)/libcucul++.la
+
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(pkgconfigdir)
+	ln -sf caca++.pc $(DESTDIR)$(pkgconfigdir)/cucul++.pc
+endif
+
+uninstall-local:
+	. libcaca++.la; \
+	for x in $$library_names; do \
+	  rm -f $(DESTDIR)$(libdir)/$$(echo $$x | sed 's/caca/cucul/g'); \
+	done
+	rm -f $(DESTDIR)$(libdir)/libcucul++.la
+	rmdir $(DESTDIR)$(libdir) 2>/dev/null || true
+	rm -f $(DESTDIR)$(pkgconfigdir)/cucul++.pc
+	rmdir $(DESTDIR)$(pkgconfigdir) 2>/dev/null || true
+
+echo-sources: ; echo $(SOURCES)
+

examples/Makefile.am

@@ -94,3 +94,5 @@ unicode_LDADD = ../caca/libcaca.la
 import_SOURCES = import.c
 import_LDADD = ../caca/libcaca.la
 
+echo-sources: ; echo $(SOURCES)
+

ruby/Makefile.am

@@ -38,3 +38,5 @@ EXTRA_DIST = ruby.dox \
              README \
              $(NULL)
 
+echo-sources: ; echo $(SOURCES)
+

src/Makefile.am

@@ -1,47 +1,49 @@
-# $Id$
-
-pkgdata_DATA = caca.txt
-
-EXTRA_DIST = caca.txt cacademo.vcproj cacafire.vcproj cacaview.vcproj
-AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca \
-              -DLIBCACA=1 -DX_DISPLAY_MISSING=1
-
-bin_PROGRAMS = cacademo cacafire cacaplay cacaview img2txt $(fcntl_programs)
-noinst_PROGRAMS = cacadraw
-
-cacademo_SOURCES = cacademo.c texture.h
-cacademo_LDADD = ../caca/libcaca.la ../caca/libcaca.la
-cacademo_LDFLAGS = @MATH_LIBS@
-
-cacafire_SOURCES = aafire.c
-cacafire_LDADD = ../caca/libcaca.la ../caca/libcaca.la
-
-cacaview_SOURCES = cacaview.c common-image.c common-image.h
-cacaview_LDADD = ../caca/libcaca.la ../caca/libcaca.la
-cacaview_CFLAGS = $(IMLIB2_CFLAGS)
-cacaview_LDFLAGS = $(IMLIB2_LIBS)
-
-cacadraw_SOURCES = cacadraw.c
-cacadraw_LDADD = ../caca/libcaca.la ../caca/libcaca.la
-
-cacaplay_SOURCES = cacaplay.c
-cacaplay_LDADD = ../caca/libcaca.la ../caca/libcaca.la
-
-cacaserver_SOURCES = cacaserver.c
-cacaserver_LDADD = ../caca/libcaca.la
-
-img2txt_SOURCES = img2txt.c $(GETOPT) common-image.c common-image.h
-img2txt_LDADD = ../caca/libcaca.la
-img2txt_CFLAGS = $(IMLIB2_CFLAGS)
-img2txt_LDFLAGS = $(IMLIB2_LIBS) $(GETOPT_LIBS)
-
-if USE_NETWORK
-fcntl_programs = cacaserver
-else
-fcntl_programs =
-endif
-
-if NEED_GETOPT_LONG
-GETOPT = mygetopt.c mygetopt.h
-endif
-
+# $Id$
+
+pkgdata_DATA = caca.txt
+
+EXTRA_DIST = caca.txt cacademo.vcproj cacafire.vcproj cacaview.vcproj
+AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/caca -I../caca \
+              -DLIBCACA=1 -DX_DISPLAY_MISSING=1
+
+bin_PROGRAMS = cacademo cacafire cacaplay cacaview img2txt $(fcntl_programs)
+noinst_PROGRAMS = cacadraw
+
+cacademo_SOURCES = cacademo.c texture.h
+cacademo_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+cacademo_LDFLAGS = @MATH_LIBS@
+
+cacafire_SOURCES = aafire.c
+cacafire_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+
+cacaview_SOURCES = cacaview.c common-image.c common-image.h
+cacaview_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+cacaview_CFLAGS = $(IMLIB2_CFLAGS)
+cacaview_LDFLAGS = $(IMLIB2_LIBS)
+
+cacadraw_SOURCES = cacadraw.c
+cacadraw_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+
+cacaplay_SOURCES = cacaplay.c
+cacaplay_LDADD = ../caca/libcaca.la ../caca/libcaca.la
+
+cacaserver_SOURCES = cacaserver.c
+cacaserver_LDADD = ../caca/libcaca.la
+
+img2txt_SOURCES = img2txt.c $(GETOPT) common-image.c common-image.h
+img2txt_LDADD = ../caca/libcaca.la
+img2txt_CFLAGS = $(IMLIB2_CFLAGS)
+img2txt_LDFLAGS = $(IMLIB2_LIBS) $(GETOPT_LIBS)
+
+if USE_NETWORK
+fcntl_programs = cacaserver
+else
+fcntl_programs =
+endif
+
+if NEED_GETOPT_LONG
+GETOPT = mygetopt.c mygetopt.h
+endif
+
+echo-sources: ; echo $(SOURCES)
+

test/check-build

@@ -29,9 +29,7 @@ fi
 failure=0
 for dir in caca src cxx examples ruby tools; do
   pushd ../$dir >/dev/null
-  # Dirty hack to print the $(SOURCES) variable
-  for x in $(make -s ID SHELL='echo @@$(SOURCES)@@' | tr -d '\n' | sed 's/.*@@\([^@]*\)@@.*/\1/');
-  do
+  for x in $(make echo-sources); do
     if grep '[[:space:]]$' "$x" >/dev/null 2>&1; then
       echo "error: $dir/$x contains trailing spaces"
       failure=1

tools/Makefile.am

@@ -20,3 +20,6 @@ pango_programs = makefont
 else
 pango_programs =
 endif
+
+echo-sources: ; echo $(SOURCES)
+

win32/Makefile.am

@@ -1,4 +1,4 @@
-# $Id$
-
-EXTRA_DIST = config.h caca_types.h
-
+# $Id$
+
+EXTRA_DIST = config.h caca_types.h
+