From 91d99f89037cc1fc06a5f985aa08133590d7943e Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Tue, 24 Nov 1998 05:58:53 +0000 Subject: [PATCH] Removed DEFS "+=" mess that breaks recent automakes. INCLUDES is the * gdk/Makefile.am, gtk/Makefile.am: Removed DEFS "+=" mess that breaks recent automakes. INCLUDES is the correct way to add to CFLAGS from Makefile.am. * gdk/gdk.c, gdk/gdkglobals.c, gdk/gdkimage.c, gdk/gdkinput.c, gdk/gdkpixmap.c, gdk/gdkthreads.c, gdk/gdkwindow.c, gdk/gxid_lib.c, gtk/fnmatch.c, gtk/gtkclist.c, gtk/gtkmain.c, gtk/testthreads.c: Include "config.h" instead of "../config.h". Now that DEFS works again, automake will automatically pass us the location of config.h in -I. --- ChangeLog | 14 ++++++++++++++ ChangeLog.pre-2-0 | 14 ++++++++++++++ ChangeLog.pre-2-10 | 14 ++++++++++++++ ChangeLog.pre-2-2 | 14 ++++++++++++++ ChangeLog.pre-2-4 | 14 ++++++++++++++ ChangeLog.pre-2-6 | 14 ++++++++++++++ ChangeLog.pre-2-8 | 14 ++++++++++++++ gdk/Makefile.am | 5 ++--- gdk/gdk.c | 2 +- gdk/gdkglobals.c | 2 +- gdk/gdkimage.c | 2 +- gdk/gdkinput.c | 2 +- gdk/gdkpixmap.c | 2 +- gdk/gdkthreads.c | 2 +- gdk/gdkwindow.c | 2 +- gdk/gxid_lib.c | 2 +- gdk/x11/gdkglobals-x11.c | 2 +- gdk/x11/gdkimage-x11.c | 2 +- gdk/x11/gdkinput.c | 2 +- gdk/x11/gdkmain-x11.c | 2 +- gdk/x11/gdkpixmap-x11.c | 2 +- gdk/x11/gdkwindow-x11.c | 2 +- gdk/x11/gxid_lib.c | 2 +- gtk/Makefile.am | 2 +- gtk/fnmatch.c | 2 +- gtk/gtkclist.c | 2 +- gtk/gtkmain.c | 2 +- gtk/testthreads.c | 2 +- tests/testthreads.c | 2 +- 29 files changed, 121 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3936d9a007..02dc4f3b5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +1998-11-23 Jeff Garzik + + * gdk/Makefile.am, gtk/Makefile.am: + Removed DEFS "+=" mess that breaks recent automakes. + INCLUDES is the correct way to add to CFLAGS from Makefile.am. + + * gdk/gdk.c, gdk/gdkglobals.c, gdk/gdkimage.c, gdk/gdkinput.c, + gdk/gdkpixmap.c, gdk/gdkthreads.c, gdk/gdkwindow.c, + gdk/gxid_lib.c, gtk/fnmatch.c, gtk/gtkclist.c, gtk/gtkmain.c, + gtk/testthreads.c: + Include "config.h" instead of "../config.h". + Now that DEFS works again, automake will automatically pass us + the location of config.h in -I. + Mon Nov 23 22:10:09 1998 Owen Taylor * gtk/Makefile.am gtk/gtk.h gtk/gtklayout.[ch] diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3936d9a007..02dc4f3b5d 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,17 @@ +1998-11-23 Jeff Garzik + + * gdk/Makefile.am, gtk/Makefile.am: + Removed DEFS "+=" mess that breaks recent automakes. + INCLUDES is the correct way to add to CFLAGS from Makefile.am. + + * gdk/gdk.c, gdk/gdkglobals.c, gdk/gdkimage.c, gdk/gdkinput.c, + gdk/gdkpixmap.c, gdk/gdkthreads.c, gdk/gdkwindow.c, + gdk/gxid_lib.c, gtk/fnmatch.c, gtk/gtkclist.c, gtk/gtkmain.c, + gtk/testthreads.c: + Include "config.h" instead of "../config.h". + Now that DEFS works again, automake will automatically pass us + the location of config.h in -I. + Mon Nov 23 22:10:09 1998 Owen Taylor * gtk/Makefile.am gtk/gtk.h gtk/gtklayout.[ch] diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3936d9a007..02dc4f3b5d 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,17 @@ +1998-11-23 Jeff Garzik + + * gdk/Makefile.am, gtk/Makefile.am: + Removed DEFS "+=" mess that breaks recent automakes. + INCLUDES is the correct way to add to CFLAGS from Makefile.am. + + * gdk/gdk.c, gdk/gdkglobals.c, gdk/gdkimage.c, gdk/gdkinput.c, + gdk/gdkpixmap.c, gdk/gdkthreads.c, gdk/gdkwindow.c, + gdk/gxid_lib.c, gtk/fnmatch.c, gtk/gtkclist.c, gtk/gtkmain.c, + gtk/testthreads.c: + Include "config.h" instead of "../config.h". + Now that DEFS works again, automake will automatically pass us + the location of config.h in -I. + Mon Nov 23 22:10:09 1998 Owen Taylor * gtk/Makefile.am gtk/gtk.h gtk/gtklayout.[ch] diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3936d9a007..02dc4f3b5d 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,17 @@ +1998-11-23 Jeff Garzik + + * gdk/Makefile.am, gtk/Makefile.am: + Removed DEFS "+=" mess that breaks recent automakes. + INCLUDES is the correct way to add to CFLAGS from Makefile.am. + + * gdk/gdk.c, gdk/gdkglobals.c, gdk/gdkimage.c, gdk/gdkinput.c, + gdk/gdkpixmap.c, gdk/gdkthreads.c, gdk/gdkwindow.c, + gdk/gxid_lib.c, gtk/fnmatch.c, gtk/gtkclist.c, gtk/gtkmain.c, + gtk/testthreads.c: + Include "config.h" instead of "../config.h". + Now that DEFS works again, automake will automatically pass us + the location of config.h in -I. + Mon Nov 23 22:10:09 1998 Owen Taylor * gtk/Makefile.am gtk/gtk.h gtk/gtklayout.[ch] diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3936d9a007..02dc4f3b5d 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,17 @@ +1998-11-23 Jeff Garzik + + * gdk/Makefile.am, gtk/Makefile.am: + Removed DEFS "+=" mess that breaks recent automakes. + INCLUDES is the correct way to add to CFLAGS from Makefile.am. + + * gdk/gdk.c, gdk/gdkglobals.c, gdk/gdkimage.c, gdk/gdkinput.c, + gdk/gdkpixmap.c, gdk/gdkthreads.c, gdk/gdkwindow.c, + gdk/gxid_lib.c, gtk/fnmatch.c, gtk/gtkclist.c, gtk/gtkmain.c, + gtk/testthreads.c: + Include "config.h" instead of "../config.h". + Now that DEFS works again, automake will automatically pass us + the location of config.h in -I. + Mon Nov 23 22:10:09 1998 Owen Taylor * gtk/Makefile.am gtk/gtk.h gtk/gtklayout.[ch] diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3936d9a007..02dc4f3b5d 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,17 @@ +1998-11-23 Jeff Garzik + + * gdk/Makefile.am, gtk/Makefile.am: + Removed DEFS "+=" mess that breaks recent automakes. + INCLUDES is the correct way to add to CFLAGS from Makefile.am. + + * gdk/gdk.c, gdk/gdkglobals.c, gdk/gdkimage.c, gdk/gdkinput.c, + gdk/gdkpixmap.c, gdk/gdkthreads.c, gdk/gdkwindow.c, + gdk/gxid_lib.c, gtk/fnmatch.c, gtk/gtkclist.c, gtk/gtkmain.c, + gtk/testthreads.c: + Include "config.h" instead of "../config.h". + Now that DEFS works again, automake will automatically pass us + the location of config.h in -I. + Mon Nov 23 22:10:09 1998 Owen Taylor * gtk/Makefile.am gtk/gtk.h gtk/gtklayout.[ch] diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3936d9a007..02dc4f3b5d 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,17 @@ +1998-11-23 Jeff Garzik + + * gdk/Makefile.am, gtk/Makefile.am: + Removed DEFS "+=" mess that breaks recent automakes. + INCLUDES is the correct way to add to CFLAGS from Makefile.am. + + * gdk/gdk.c, gdk/gdkglobals.c, gdk/gdkimage.c, gdk/gdkinput.c, + gdk/gdkpixmap.c, gdk/gdkthreads.c, gdk/gdkwindow.c, + gdk/gxid_lib.c, gtk/fnmatch.c, gtk/gtkclist.c, gtk/gtkmain.c, + gtk/testthreads.c: + Include "config.h" instead of "../config.h". + Now that DEFS works again, automake will automatically pass us + the location of config.h in -I. + Mon Nov 23 22:10:09 1998 Owen Taylor * gtk/Makefile.am gtk/gtk.h gtk/gtklayout.[ch] diff --git a/gdk/Makefile.am b/gdk/Makefile.am index c9046e29ca..d67d38661e 100644 --- a/gdk/Makefile.am +++ b/gdk/Makefile.am @@ -3,7 +3,8 @@ gdkincludedir = $(includedir)/gdk lib_LTLIBRARIES = libgdk.la -DEFS += -DG_LOG_DOMAIN=\"Gdk\" + +INCLUDES = -DG_LOG_DOMAIN=\"Gdk\" -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ libgdk_la_SOURCES = \ gdk.c \ @@ -54,8 +55,6 @@ libgdk_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -release $(LT_RELEASE) \ @x_ldflags@ @x_libs@ -INCLUDES = -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ - EXTRA_PROGRAMS = gxid bin_PROGRAMS = @xinput_progs@ diff --git a/gdk/gdk.c b/gdk/gdk.c index 217724417c..36e0fb1438 100644 --- a/gdk/gdk.c +++ b/gdk/gdk.c @@ -16,7 +16,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#include "../config.h" +#include "config.h" /* If you don't want to use gdk's signal handlers define this */ /* #define I_NEED_TO_ACTUALLY_DEBUG_MY_PROGRAMS 1 */ diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c index d21be2f294..5736a1a80d 100644 --- a/gdk/gdkglobals.c +++ b/gdk/gdkglobals.c @@ -20,7 +20,7 @@ #include #include "gdktypes.h" #include "gdkprivate.h" -#include "../config.h" +#include "config.h" guint gdk_debug_flags = 0; gint gdk_use_xshm = TRUE; diff --git a/gdk/gdkimage.c b/gdk/gdkimage.c index 2cc850b532..8e62fef664 100644 --- a/gdk/gdkimage.c +++ b/gdk/gdkimage.c @@ -16,7 +16,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#include "../config.h" +#include "config.h" #include #include diff --git a/gdk/gdkinput.c b/gdk/gdkinput.c index 444d630efc..c0f199fae9 100644 --- a/gdk/gdkinput.c +++ b/gdk/gdkinput.c @@ -19,7 +19,7 @@ #include #include #include -#include "../config.h" +#include "config.h" #include "gdk.h" #include "gdkx.h" #include "gdkprivate.h" diff --git a/gdk/gdkpixmap.c b/gdk/gdkpixmap.c index 291c8d7746..3467388d46 100644 --- a/gdk/gdkpixmap.c +++ b/gdk/gdkpixmap.c @@ -16,7 +16,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#include "../config.h" +#include "config.h" #include #include #include diff --git a/gdk/gdkthreads.c b/gdk/gdkthreads.c index d83375b57e..3ede36b60e 100644 --- a/gdk/gdkthreads.c +++ b/gdk/gdkthreads.c @@ -16,7 +16,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#include "../config.h" +#include "config.h" #include "gdk.h" #include "gdkprivate.h" diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c index 302fc3734f..09399dcf1a 100644 --- a/gdk/gdkwindow.c +++ b/gdk/gdkwindow.c @@ -22,7 +22,7 @@ #include #include #include "gdk.h" -#include "../config.h" +#include "config.h" #include "gdkinput.h" #include "gdkprivate.h" #include "MwmUtil.h" diff --git a/gdk/gxid_lib.c b/gdk/gxid_lib.c index 64c1e53b1f..0c2a73bbf5 100644 --- a/gdk/gxid_lib.c +++ b/gdk/gxid_lib.c @@ -4,7 +4,7 @@ * Copyright 1997 Owen Taylor */ -#include "../config.h" +#include "config.h" #include "gxid_lib.h" #ifdef XINPUT_GXI diff --git a/gdk/x11/gdkglobals-x11.c b/gdk/x11/gdkglobals-x11.c index d21be2f294..5736a1a80d 100644 --- a/gdk/x11/gdkglobals-x11.c +++ b/gdk/x11/gdkglobals-x11.c @@ -20,7 +20,7 @@ #include #include "gdktypes.h" #include "gdkprivate.h" -#include "../config.h" +#include "config.h" guint gdk_debug_flags = 0; gint gdk_use_xshm = TRUE; diff --git a/gdk/x11/gdkimage-x11.c b/gdk/x11/gdkimage-x11.c index 2cc850b532..8e62fef664 100644 --- a/gdk/x11/gdkimage-x11.c +++ b/gdk/x11/gdkimage-x11.c @@ -16,7 +16,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#include "../config.h" +#include "config.h" #include #include diff --git a/gdk/x11/gdkinput.c b/gdk/x11/gdkinput.c index 444d630efc..c0f199fae9 100644 --- a/gdk/x11/gdkinput.c +++ b/gdk/x11/gdkinput.c @@ -19,7 +19,7 @@ #include #include #include -#include "../config.h" +#include "config.h" #include "gdk.h" #include "gdkx.h" #include "gdkprivate.h" diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c index 217724417c..36e0fb1438 100644 --- a/gdk/x11/gdkmain-x11.c +++ b/gdk/x11/gdkmain-x11.c @@ -16,7 +16,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#include "../config.h" +#include "config.h" /* If you don't want to use gdk's signal handlers define this */ /* #define I_NEED_TO_ACTUALLY_DEBUG_MY_PROGRAMS 1 */ diff --git a/gdk/x11/gdkpixmap-x11.c b/gdk/x11/gdkpixmap-x11.c index 291c8d7746..3467388d46 100644 --- a/gdk/x11/gdkpixmap-x11.c +++ b/gdk/x11/gdkpixmap-x11.c @@ -16,7 +16,7 @@ * Free Software Foundation, Inc., 59 Temple Place - Suite 330, * Boston, MA 02111-1307, USA. */ -#include "../config.h" +#include "config.h" #include #include #include diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c index 302fc3734f..09399dcf1a 100644 --- a/gdk/x11/gdkwindow-x11.c +++ b/gdk/x11/gdkwindow-x11.c @@ -22,7 +22,7 @@ #include #include #include "gdk.h" -#include "../config.h" +#include "config.h" #include "gdkinput.h" #include "gdkprivate.h" #include "MwmUtil.h" diff --git a/gdk/x11/gxid_lib.c b/gdk/x11/gxid_lib.c index 64c1e53b1f..0c2a73bbf5 100644 --- a/gdk/x11/gxid_lib.c +++ b/gdk/x11/gxid_lib.c @@ -4,7 +4,7 @@ * Copyright 1997 Owen Taylor */ -#include "../config.h" +#include "config.h" #include "gxid_lib.h" #ifdef XINPUT_GXI diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 6e64f95b29..e3c33eb94b 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -1,7 +1,6 @@ ### Process this file with automake to produce Makefile.in gtkincludedir = $(includedir)/gtk -DEFS += -DG_LOG_DOMAIN=\"Gtk\" lib_LTLIBRARIES = libgtk.la @@ -340,6 +339,7 @@ EXTRA_DIST = \ circles.xbm INCLUDES = \ + -DG_LOG_DOMAIN=\"Gtk\" \ -DGTK_EXE_PREFIX=\"$(exec_prefix)\" \ -DGTK_DATA_PREFIX=\"$(prefix)\" \ -I$(top_srcdir) @GLIB_CFLAGS@ @x_cflags@ diff --git a/gtk/fnmatch.c b/gtk/fnmatch.c index 8f03f3f4f8..bd4375f400 100644 --- a/gtk/fnmatch.c +++ b/gtk/fnmatch.c @@ -17,7 +17,7 @@ */ #ifdef HAVE_CONFIG_H -#include "../config.h" +#include "config.h" #endif #include diff --git a/gtk/gtkclist.c b/gtk/gtkclist.c index ecd92bdc42..d3eb21a443 100644 --- a/gtk/gtkclist.c +++ b/gtk/gtkclist.c @@ -19,7 +19,7 @@ */ #include #include -#include "../config.h" +#include "config.h" #include "gtkmain.h" #include "gtkclist.h" #include "gtkbindings.h" diff --git a/gtk/gtkmain.c b/gtk/gtkmain.c index f78d2beefc..b05f47a85e 100644 --- a/gtk/gtkmain.c +++ b/gtk/gtkmain.c @@ -39,7 +39,7 @@ #include "gtkwindow.h" #include "gtkprivate.h" #include "gdk/gdki18n.h" -#include "../config.h" +#include "config.h" #include "gtkdebug.h" diff --git a/gtk/testthreads.c b/gtk/testthreads.c index 4d02a06435..27e0753f31 100644 --- a/gtk/testthreads.c +++ b/gtk/testthreads.c @@ -19,7 +19,7 @@ #include #include #include -#include "../config.h" +#include "config.h" #ifdef USE_PTHREADS #include diff --git a/tests/testthreads.c b/tests/testthreads.c index 4d02a06435..27e0753f31 100644 --- a/tests/testthreads.c +++ b/tests/testthreads.c @@ -19,7 +19,7 @@ #include #include #include -#include "../config.h" +#include "config.h" #ifdef USE_PTHREADS #include