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)
This commit is contained in:
Jeff Garzik 1998-11-12 04:28:52 +00:00
parent 24273ca743
commit 242cb51bfe
12 changed files with 66 additions and 6 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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,

View File

@ -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 \