INCLUDES is the right way to add to CFLAGS, not DEFS. Also there are bugs

	INCLUDES is the right way to add to CFLAGS, not DEFS.
	Also there are bugs with '+=' in makefiles.

	Got rid of DEFS line by moving G_LOG_DOMAIN setting into INCLUDES.
	Removed redundant -I from INCLUDES.

	This fixes an annoying bug where autoconf's DEFS, which includes
	the important -DHAVE_CONFIG_H, was lost.  (due to += weirdness)

12 files changed, 66 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 8622b707f..83bdc892f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Wed Nov 11 23:23:22 EST 1998 Jeff Garzik <jgarzik@pobox.com>
+
+	* Makefile.am : INCLUDES is the right way to add to CFLAGS, not
+	DEFS.  Also there are bugs with '+=' in makefiles.
+	Got rid of DEFS line by moving G_LOG_DOMAIN setting into INCLUDES.
+	Removed redundant -I from INCLUDES.
+
 Wed Nov 11 18:11:24 EST 1998 Gregory McLean <gregm@comstar.net>
 
 	* docs/*.sgml : Batch of new documentation that should be easier
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 8622b707f..83bdc892f 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+Wed Nov 11 23:23:22 EST 1998 Jeff Garzik <jgarzik@pobox.com>
+
+	* Makefile.am : INCLUDES is the right way to add to CFLAGS, not
+	DEFS.  Also there are bugs with '+=' in makefiles.
+	Got rid of DEFS line by moving G_LOG_DOMAIN setting into INCLUDES.
+	Removed redundant -I from INCLUDES.
+
 Wed Nov 11 18:11:24 EST 1998 Gregory McLean <gregm@comstar.net>
 
 	* docs/*.sgml : Batch of new documentation that should be easier
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 8622b707f..83bdc892f 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+Wed Nov 11 23:23:22 EST 1998 Jeff Garzik <jgarzik@pobox.com>
+
+	* Makefile.am : INCLUDES is the right way to add to CFLAGS, not
+	DEFS.  Also there are bugs with '+=' in makefiles.
+	Got rid of DEFS line by moving G_LOG_DOMAIN setting into INCLUDES.
+	Removed redundant -I from INCLUDES.
+
 Wed Nov 11 18:11:24 EST 1998 Gregory McLean <gregm@comstar.net>
 
 	* docs/*.sgml : Batch of new documentation that should be easier
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index 8622b707f..83bdc892f 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,10 @@
+Wed Nov 11 23:23:22 EST 1998 Jeff Garzik <jgarzik@pobox.com>
+
+	* Makefile.am : INCLUDES is the right way to add to CFLAGS, not
+	DEFS.  Also there are bugs with '+=' in makefiles.
+	Got rid of DEFS line by moving G_LOG_DOMAIN setting into INCLUDES.
+	Removed redundant -I from INCLUDES.
+
 Wed Nov 11 18:11:24 EST 1998 Gregory McLean <gregm@comstar.net>
 
 	* docs/*.sgml : Batch of new documentation that should be easier
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 8622b707f..83bdc892f 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+Wed Nov 11 23:23:22 EST 1998 Jeff Garzik <jgarzik@pobox.com>
+
+	* Makefile.am : INCLUDES is the right way to add to CFLAGS, not
+	DEFS.  Also there are bugs with '+=' in makefiles.
+	Got rid of DEFS line by moving G_LOG_DOMAIN setting into INCLUDES.
+	Removed redundant -I from INCLUDES.
+
 Wed Nov 11 18:11:24 EST 1998 Gregory McLean <gregm@comstar.net>
 
 	* docs/*.sgml : Batch of new documentation that should be easier
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 8622b707f..83bdc892f 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+Wed Nov 11 23:23:22 EST 1998 Jeff Garzik <jgarzik@pobox.com>
+
+	* Makefile.am : INCLUDES is the right way to add to CFLAGS, not
+	DEFS.  Also there are bugs with '+=' in makefiles.
+	Got rid of DEFS line by moving G_LOG_DOMAIN setting into INCLUDES.
+	Removed redundant -I from INCLUDES.
+
 Wed Nov 11 18:11:24 EST 1998 Gregory McLean <gregm@comstar.net>
 
 	* docs/*.sgml : Batch of new documentation that should be easier
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 8622b707f..83bdc892f 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+Wed Nov 11 23:23:22 EST 1998 Jeff Garzik <jgarzik@pobox.com>
+
+	* Makefile.am : INCLUDES is the right way to add to CFLAGS, not
+	DEFS.  Also there are bugs with '+=' in makefiles.
+	Got rid of DEFS line by moving G_LOG_DOMAIN setting into INCLUDES.
+	Removed redundant -I from INCLUDES.
+
 Wed Nov 11 18:11:24 EST 1998 Gregory McLean <gregm@comstar.net>
 
 	* docs/*.sgml : Batch of new documentation that should be easier
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 8622b707f..83bdc892f 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+Wed Nov 11 23:23:22 EST 1998 Jeff Garzik <jgarzik@pobox.com>
+
+	* Makefile.am : INCLUDES is the right way to add to CFLAGS, not
+	DEFS.  Also there are bugs with '+=' in makefiles.
+	Got rid of DEFS line by moving G_LOG_DOMAIN setting into INCLUDES.
+	Removed redundant -I from INCLUDES.
+
 Wed Nov 11 18:11:24 EST 1998 Gregory McLean <gregm@comstar.net>
 
 	* docs/*.sgml : Batch of new documentation that should be easier
diff --git a/Makefile.am b/Makefile.am
index 75e448345..bf03bcc65 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,7 @@ bin_SCRIPTS=glib-config
 BUILT_SOURCES=glib-config
 glib-config: glib-config.in
 
-DEFS += -DG_LOG_DOMAIN=g_log_domain_glib
+INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib
 
 EXTRA_DIST = \
 	glib.m4		\
@@ -63,7 +63,6 @@ stamp-gc-h: config.status
 
 libglib_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-INCLUDES = -I$(top_srcdir)
 
 noinst_PROGRAMS = testglib
 testglib_LDADD = libglib.la
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 75e448345..bf03bcc65 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -12,7 +12,7 @@ bin_SCRIPTS=glib-config
 BUILT_SOURCES=glib-config
 glib-config: glib-config.in
 
-DEFS += -DG_LOG_DOMAIN=g_log_domain_glib
+INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib
 
 EXTRA_DIST = \
 	glib.m4		\
@@ -63,7 +63,6 @@ stamp-gc-h: config.status
 
 libglib_la_LDFLAGS = \
 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE)
-INCLUDES = -I$(top_srcdir)
 
 noinst_PROGRAMS = testglib
 testglib_LDADD = libglib.la
diff --git a/gmodule/ChangeLog b/gmodule/ChangeLog
index ad6c76a44..2ee216708 100644
--- a/gmodule/ChangeLog
+++ b/gmodule/ChangeLog
@@ -1,3 +1,10 @@
+Wed Nov 11 23:23:22 EST 1998 Jeff Garzik <jgarzik@pobox.com>
+
+        * Makefile.am : INCLUDES is the right way to add to CFLAGS, not 
+        DEFS.  Also there are bugs with '+=' in makefiles.
+        Got rid of DEFS line by moving G_LOG_DOMAIN setting into INCLUDES.
+        Removed redundant -I from INCLUDES.
+
 Tue Oct 27 04:00:11 1998  Tim Janik  <timj@gtk.org>
 
 	* testgmodule.c (main): changed the #ifdef WIN32 test to NATIVE_WIN32,
diff --git a/gmodule/Makefile.am b/gmodule/Makefile.am
index 818f0a01f..4d182ed68 100644
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@@ -1,7 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule
-DEFS += -DG_LOG_DOMAIN=g_log_domain_gmodule
+INCLUDES = -I$(top_srcdir)/gmodule -DG_LOG_DOMAIN=g_log_domain_gmodule
 
 EXTRA_DIST =	\
 		gmoduleconf.h.in \