Put -DFOO stuff into Makefile.am INCLUDES.

2024-11-10 03:16:17 +01:00 · 1998-11-29 22:47:07 +00:00 · 1998-11-29 22:47:07 +00:00 · e54410edc2
commit e54410edc2
parent 4f0565f380
12 changed files with 47 additions and 5 deletions
--- a/5
+++ b/5
@ -1,3 +1,8 @@
+Sun Nov 29 17:31:43 EST 1998  Jeff Garzik  <jgarzik@pobox.com>
+
+	* configure.in, Makefile.am, gmodule/Makefile.am:
+	Put -DFOO stuff into Makefile.am INCLUDES.
+
 Sun Nov 29 14:17:09 PST 1998 Manish Singh <yosh@gimp.org>

 	* configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@ -1,3 +1,8 @@
+Sun Nov 29 17:31:43 EST 1998  Jeff Garzik  <jgarzik@pobox.com>
+
+	* configure.in, Makefile.am, gmodule/Makefile.am:
+	Put -DFOO stuff into Makefile.am INCLUDES.
+
 Sun Nov 29 14:17:09 PST 1998 Manish Singh <yosh@gimp.org>

 	* configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@ -1,3 +1,8 @@
+Sun Nov 29 17:31:43 EST 1998  Jeff Garzik  <jgarzik@pobox.com>
+
+	* configure.in, Makefile.am, gmodule/Makefile.am:
+	Put -DFOO stuff into Makefile.am INCLUDES.
+
 Sun Nov 29 14:17:09 PST 1998 Manish Singh <yosh@gimp.org>

 	* configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@ -1,3 +1,8 @@
+Sun Nov 29 17:31:43 EST 1998  Jeff Garzik  <jgarzik@pobox.com>
+
+	* configure.in, Makefile.am, gmodule/Makefile.am:
+	Put -DFOO stuff into Makefile.am INCLUDES.
+
 Sun Nov 29 14:17:09 PST 1998 Manish Singh <yosh@gimp.org>

 	* configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@ -1,3 +1,8 @@
+Sun Nov 29 17:31:43 EST 1998  Jeff Garzik  <jgarzik@pobox.com>
+
+	* configure.in, Makefile.am, gmodule/Makefile.am:
+	Put -DFOO stuff into Makefile.am INCLUDES.
+
 Sun Nov 29 14:17:09 PST 1998 Manish Singh <yosh@gimp.org>

 	* configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@ -1,3 +1,8 @@
+Sun Nov 29 17:31:43 EST 1998  Jeff Garzik  <jgarzik@pobox.com>
+
+	* configure.in, Makefile.am, gmodule/Makefile.am:
+	Put -DFOO stuff into Makefile.am INCLUDES.
+
 Sun Nov 29 14:17:09 PST 1998 Manish Singh <yosh@gimp.org>

 	* configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@ -1,3 +1,8 @@
+Sun Nov 29 17:31:43 EST 1998  Jeff Garzik  <jgarzik@pobox.com>
+
+	* configure.in, Makefile.am, gmodule/Makefile.am:
+	Put -DFOO stuff into Makefile.am INCLUDES.
+
 Sun Nov 29 14:17:09 PST 1998 Manish Singh <yosh@gimp.org>

 	* configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@ -1,3 +1,8 @@
+Sun Nov 29 17:31:43 EST 1998  Jeff Garzik  <jgarzik@pobox.com>
+
+	* configure.in, Makefile.am, gmodule/Makefile.am:
+	Put -DFOO stuff into Makefile.am INCLUDES.
+
 Sun Nov 29 14:17:09 PST 1998 Manish Singh <yosh@gimp.org>

 	* configure.in: put debug -DFOO stuff into CPPFLAGS, not CFLAGS,
--- a/Makefile.am
+++ b/Makefile.am
@ -12,7 +12,7 @@ bin_SCRIPTS=glib-config
 BUILT_SOURCES=glib-config
 glib-config: glib-config.in

-INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib
+INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@

 EXTRA_DIST = \
 	glib.m4		\
--- a/configure.in
+++ b/configure.in
@ -83,10 +83,10 @@ fi

 if test "x$enable_debug" = "xyes"; then
  test "$cflags_set" = set || CFLAGS="$CFLAGS -g"
-  CPPFLAGS="$CPPFLAGS -DG_ENABLE_DEBUG"
+  GLIB_DEBUG_FLAGS="-DG_ENABLE_DEBUG"
 else
  if test "x$enable_debug" = "xno"; then
-    CPPFLAGS="$CPPFLAGS -DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
+    GLIB_DEBUG_FLAGS="-DG_DISABLE_ASSERT -DG_DISABLE_CHECKS"
  fi
 fi

@ -505,6 +505,7 @@ AC_SUBST(G_MODULE_LIBS)
 AC_SUBST(G_MODULE_LDFLAGS)
 AC_SUBST(G_MODULE_HAVE_DLERROR)
 AC_SUBST(G_MODULE_NEED_USCORE)
+AC_SUBST(GLIB_DEBUG_FLAGS)

 AC_OUTPUT_COMMANDS([

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

-INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib
+INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@

 EXTRA_DIST = \
 	glib.m4		\
--- a/gmodule/Makefile.am
+++ b/gmodule/Makefile.am
@ -1,6 +1,7 @@
 ## Process this file with automake to produce Makefile.in

-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule -DG_LOG_DOMAIN=g_log_domain_gmodule
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/gmodule \
+	-DG_LOG_DOMAIN=g_log_domain_gmodule @GLIB_DEBUG_FLAGS@

 EXTRA_DIST =	\
 		gmoduleconf.h.in \