Replace INCLUDES by AM_CPPFLAGS, other cleanups.

2007-11-24  Matthias Clasen  <mclasen@redhat.com>

        * */Makefile.am: Replace INCLUDES by AM_CPPFLAGS, other
        cleanups.



svn path=/trunk/; revision=5932

ChangeLog

@@ -1,3 +1,8 @@
+2007-11-24  Matthias Clasen  <mclasen@redhat.com>
+
+	* */Makefile.am: Replace INCLUDES by AM_CPPFLAGS, other
+	cleanups.
+
 2007-11-24  Matthias Clasen  <mclasen@redhat.com>
 
 	* tests/base64-test.c: Fix a memory overrun.

Makefile.am

@@ -7,8 +7,11 @@ SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
 
 bin_SCRIPTS = glib-gettextize
 
-INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ \
+AM_CPPFLAGS = 					\
-	-DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
+	-DG_LOG_DOMAIN=g_log_domain_glib 	\
+	@GLIB_DEBUG_FLAGS@ 			\
+	-DG_DISABLE_DEPRECATED 			\
+	-DGLIB_COMPILATION
 
 EXTRA_DIST += 			\
 	ChangeLog.pre-2-14	\

glib/Makefile.am

@@ -23,8 +23,13 @@ SUBDIRS = libcharset $(PRINTF_SUBDIR) $(MAYBE_PCRE) update-pcre . tests
 
 DIST_SUBDIRS = libcharset gnulib pcre update-pcre
 
-INCLUDES = -I$(top_srcdir) $(pcre_inc) -DG_LOG_DOMAIN=\"GLib\" \
+AM_CPPFLAGS = 				\
-	$(GLIB_DEBUG_FLAGS) -DG_DISABLE_DEPRECATED -DGLIB_COMPILATION \
+	-I$(top_srcdir) 		\
+	$(pcre_inc) 			\
+	-DG_LOG_DOMAIN=\"GLib\" 	\
+	$(GLIB_DEBUG_FLAGS) 		\
+	-DG_DISABLE_DEPRECATED 		\
+	-DGLIB_COMPILATION 		\
 	-DPCRE_STATIC
 
 glib.def: glib.symbols

gmodule/Makefile.am

@@ -1,8 +1,13 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule \
+AM_CPPFLAGS = 				\
-	-DG_LOG_DOMAIN=\"GModule\" @GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED
+	-I$(top_srcdir) 		\
+	-I$(top_srcdir)/glib 		\
+	-I$(top_srcdir)/gmodule 	\
+	-DG_LOG_DOMAIN=\"GModule\" 	\
+	@GLIB_DEBUG_FLAGS@ 		\
+	-DG_DISABLE_DEPRECATED
 
 EXTRA_DIST +=				\
 		makefile.msc.in 	\

gobject/Makefile.am

@@ -4,7 +4,7 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = \
+AM_CPPFLAGS = 					\
 	-DG_LOG_DOMAIN=\"GLib-GObject\"		\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/glib			\

gthread/Makefile.am

@@ -1,9 +1,14 @@
 ## Process this file with automake to produce Makefile.in
 include $(top_srcdir)/Makefile.decl
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gthread \
+AM_CPPFLAGS = 				\
-	-DG_LOG_DOMAIN=\"GThread\" @GTHREAD_COMPILE_IMPL_DEFINES@ \
+	-I$(top_srcdir) 		\
-	@GLIB_DEBUG_FLAGS@ -DG_DISABLE_DEPRECATED
+	-I$(top_srcdir)/glib 		\
+	-I$(top_srcdir)/gthread 	\
+	-DG_LOG_DOMAIN=\"GThread\" 	\
+	@GTHREAD_COMPILE_IMPL_DEFINES@ 	\
+	@GLIB_DEBUG_FLAGS@ 		\
+	-DG_DISABLE_DEPRECATED
 
 EXTRA_DIST +=				\
 		makefile.msc.in		\

tests/Makefile.am

@@ -8,7 +8,14 @@ else
 enable_regex =
 endif
 
-INCLUDES = -g -I$(top_srcdir) -I$(top_srcdir)/glib -I$(top_srcdir)/gmodule $(GLIB_DEBUG_FLAGS) $(enable_regex)
+AM_CPPFLAGS = 				\
+	-I$(top_srcdir) 		\
+	-I$(top_srcdir)/glib 		\
+	-I$(top_srcdir)/gmodule 	\
+	$(GLIB_DEBUG_FLAGS) 		\
+	$(enable_regex)
+
+AM_CFLAGS = -g
 
 EFENCE=
 
@@ -58,7 +65,15 @@ endif
 if ENABLE_TIMELOOP
 timeloop = timeloop timeloop-closure
 endif
-noinst_PROGRAMS = testglib testgdate testgdateparser unicode-normalize unicode-collate $(timeloop) errorcheck-mutex-test
+noinst_PROGRAMS = 		\
+	testglib		\
+	testgdate 		\
+	testgdateparser 	\
+	unicode-normalize 	\
+	unicode-collate 	\
+	$(timeloop) 		\
+	errorcheck-mutex-test
+
 testglib_LDADD = $(libglib)
 patterntest_LDADD = $(libglib)
 testgdate_LDADD = $(libglib)
@@ -231,7 +246,8 @@ dist-hook: $(BUILT_EXTRA_DIST)
 	for f in $(srcdir)/bookmarks/* ; do  			\
 	  cp $$f $(distdir)/bookmarks; done 
 
-DISTCLEANFILES = iochannel-test-outfile \
+DISTCLEANFILES =		\
+	iochannel-test-outfile 	\
 	file-test-get-contents 	\
 	maptest 		\
 	mapchild 		\