devhelp r1215 - in trunk: . build src

[rhult svn gnome org]

Author: rhult
Date: Sat Oct 11 07:29:54 2008
New Revision: 1215
URL: http://svn.gnome.org/viewvc/devhelp?rev=1215&view=rev

Log:
2008-10-11  Richard Hult  <richard imendio com>

	* build/Makefile.am.gi18n-check:
	* src/Makefile.am: Add check for gi18n vs gi18n-lib, based on
	patch from Sven Herzberg.


Added:
   trunk/build/Makefile.am.gi18n-check
Modified:
   trunk/ChangeLog
   trunk/src/Makefile.am

Added: trunk/build/Makefile.am.gi18n-check
==============================================================================
--- (empty file)
+++ trunk/build/Makefile.am.gi18n-check	Sat Oct 11 07:29:54 2008
@@ -0,0 +1,21 @@
+check-local: Makefile
+	@for f in $(GI18N_CHECK_LIB_FILES); do \
+	  if echo $$f | grep -q "\\.h\$$"; then \
+            if grep -n "#.*include.*glib/gi18n.*\\.h" $$f; then \
+	      echo "$$f includes an i18n header" >&2 ; \
+              exit 1; \
+            fi; \
+          elif echo $$f | grep -q "\\.c\$$"; then \
+	    if grep -n "#.*include.*glib/gi18n\\.h" $$f; then \
+	      echo "$$f includes glib/gi18n.h, not glib/gi18n-lib.h" >&2 ; \
+	      exit 1; \
+	    fi; \
+          fi; \
+	done; \
+	\
+	for f in $(GI18N_CHECK_APP_FILES); do \
+          if grep -n "#.*include.*glib/gi18n-lib\\.h" $$f; then \
+            echo "$$f includes glib/gi18n-lib.h, not glib/gi18n.h" >&2 \
+	    exit 1; \
+          fi; \
+	done

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sat Oct 11 07:29:54 2008
@@ -1,5 +1,6 @@
 include $(top_srcdir)/build/Makefile.am.common
 include $(top_srcdir)/build/Makefile.am.marshal
+include $(top_srcdir)/build/Makefile.am.gi18n-check
 
 AM_CPPFLAGS += 						\
 	-DLOCALEDIR=\""$(datadir)/locale"\" 	  	\
@@ -90,3 +91,6 @@
 endif
 
 MARSHAL=dh
+
+GI18N_CHECK_LIB_FILES = $(libdevhelp_1_la_SOURCES) $(devhelpinclude_HEADERS)
+GI18N_CHECK_APP_FILES = $(devhelp_SOURCES)