summaryrefslogtreecommitdiff
path: root/gmodule
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@src.gnome.org>1998-11-12 04:28:52 +0000
committerJeff Garzik <jgarzik@src.gnome.org>1998-11-12 04:28:52 +0000
commit242cb51bfeb87c878e3895d5de2cbde290e25559 (patch)
treec9d1f795dd5e2eb013c2e25e63f176348a77c543 /gmodule
parent24273ca743bc88e8c2a64fead4f13b8367af0ddd (diff)
downloadglib-242cb51bfeb87c878e3895d5de2cbde290e25559.tar.gz
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)
Diffstat (limited to 'gmodule')
-rw-r--r--gmodule/ChangeLog7
-rw-r--r--gmodule/Makefile.am3
2 files changed, 8 insertions, 2 deletions
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 \