Distinguish between C and other source when doing whitespace checksmerge_point_for_telepathy-gabble-olpc

20070405192604-53eee-f931ee8007803f58853773819d842bb1988d6247.gz

4 files changed, 37 insertions, 14 deletions

diff --git a/lib/telepathy-glib/Makefile.am b/lib/telepathy-glib/Makefile.am
index 3a8d8dbc9..e7da23142 100644
--- a/lib/telepathy-glib/Makefile.am
+++ b/lib/telepathy-glib/Makefile.am
@@ -84,25 +84,26 @@ CLEANFILES = $(BUILT_SOURCES) _gen/.exists
 clean-local:
 	-rmdir _gen
 
-whitespace_sources = \
+check_c_sources = \
     $(tpginclude_HEADERS) \
     $(libtelepathy_glib_la_SOURCES)
+check_whitespace_sources = $(check_c_sources)
 
 check-local::
 	@echo "Checking whitespace-related trivia..."
-	@if grep -n ' $$' $(whitespace_sources); \
+	@if grep -n ' $$' $(check_whitespace_sources); \
 	then \
 		echo "^^^ The above files contain unwanted trailing spaces"; \
 		exit 1; \
 	fi
-	@if grep -n '	' $(whitespace_sources); \
+	@if grep -n '	' $(check_whitespace_sources); \
 	then \
 		echo "^^^ The above files contain tabs"; \
 		exit 1; \
 	fi
 	@echo "Checking for GError mistakes..."
 	@if grep -n '^ *GError *\*[a-zA-Z_][a-zA-Z0-9_]* *;' \
-		$(whitespace_sources); \
+		$(check_c_sources); \
 	then \
 		echo "^^^ The above files contain uninitialized GError*s -"; \
 		echo "    they should be initialized to NULL"; \
diff --git a/lib/tests/Makefile.am b/lib/tests/Makefile.am
index 5499c851b..dcbe1a17c 100644
--- a/lib/tests/Makefile.am
+++ b/lib/tests/Makefile.am
@@ -32,20 +32,29 @@ test_internal_debug_SOURCES = \
 test_internal_debug_LDADD = \
     ../telepathy-glib/libtelepathy-glib.la
 
-whitespace_sources = *.c
+check_c_sources = *.c
+check_whitespace_sources = $(check_c_sources)
 
 check-local::
 	@echo "Checking whitespace-related trivia..."
-	@if grep -n ' $$' $(whitespace_sources); \
+	@if grep -n ' $$' $(check_whitespace_sources); \
 	then \
 		echo "^^^ The above files contain unwanted trailing spaces"; \
 		exit 1; \
 	fi
-	@if grep -n '	' $(whitespace_sources); \
+	@if grep -n '	' $(check_whitespace_sources); \
 	then \
 		echo "^^^ The above files contain tabs"; \
 		exit 1; \
 	fi
+	@echo "Checking for GError mistakes..."
+	@if grep -n '^ *GError *\*[a-zA-Z_][a-zA-Z0-9_]* *;' \
+		$(check_c_sources); \
+	then \
+		echo "^^^ The above files contain uninitialized GError*s -"; \
+		echo "    they should be initialized to NULL"; \
+		exit 1; \
+	fi
 
 AM_CFLAGS = $(ERROR_CFLAGS) @DBUS_CFLAGS@ @GLIB_CFLAGS@ @COVERAGE_CFLAGS@ -I.. -I$(srcdir)/..
 AM_LDFLAGS = @DBUS_LIBS@ @GLIB_LIBS@
diff --git a/src/Makefile.am b/src/Makefile.am
index f876f2ebb..113a853c8 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -92,27 +92,28 @@ telepathy_gabble_SOURCES = \
     gabble.h \
     gabble.c
 
-whitespace_sources = \
+check_c_sources = \
     $(telepathy_gabble_SOURCES) \
     $(libgabble_convenience_la_our_sources) \
     $(telepathy_gabble_SOURCES) \
     $(write_mgr_file_SOURCES)
+check_whitespace_sources = $(check_c_sources)
 
 check-local::
 	@echo "Checking whitespace-related trivia..."
-	@if grep -n ' $$' $(whitespace_sources); \
+	@if grep -n ' $$' $(check_whitespace_sources); \
 	then \
 		echo "^^^ The above files contain unwanted trailing spaces"; \
 		exit 1; \
 	fi
-	@if grep -n '	' $(whitespace_sources); \
+	@if grep -n '	' $(check_whitespace_sources); \
 	then \
 		echo "^^^ The above files contain tabs"; \
 		exit 1; \
 	fi
 	@echo "Checking for GError mistakes..."
 	@if grep -n '^ *GError *\*[a-zA-Z_][a-zA-Z0-9_]* *;' \
-		$(whitespace_sources); \
+		$(check_c_sources); \
 	then \
 		echo "^^^ The above files contain uninitialized GError*s -"; \
 		echo "    they should be initialized to NULL"; \
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 0d8be793a..9bbb96636 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -55,17 +55,29 @@ EXTRA_DIST = $(service_in_files) $(conf_in_files)
 
 CLEANFILES = $(BUILT_SOURCES)
 
-whitespace_sources = *.c $(python_tests_shfiles) $(python_tests_pythonfiles)
+check_c_sources = *.c
+check_whitespace_sources = \
+    $(check_c_sources) \
+    $(python_tests_shfiles) \
+    $(python_tests_pythonfiles)
 
 check-local::
 	@echo "Checking whitespace-related trivia..."
-	@if grep -n ' $$' $(whitespace_sources); \
+	@if grep -n ' $$' $(check_whitespace_sources); \
 	then \
 		echo "^^^ The above files contain unwanted trailing spaces"; \
 		exit 1; \
 	fi
-	@if grep -n '	' $(whitespace_sources); \
+	@if grep -n '	' $(check_whitespace_sources); \
 	then \
 		echo "^^^ The above files contain tabs"; \
 		exit 1; \
 	fi
+	@echo "Checking for GError mistakes..."
+	@if grep -n '^ *GError *\*[a-zA-Z_][a-zA-Z0-9_]* *;' \
+		$(check_c_sources); \
+	then \
+		echo "^^^ The above files contain uninitialized GError*s -"; \
+		echo "    they should be initialized to NULL"; \
+		exit 1; \
+	fi