diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | backends/Makefile.am | 2 | ||||
| -rw-r--r-- | examples/Makefile.am | 2 | ||||
| -rw-r--r-- | examples/basic-gconf-app.c | 3 | ||||
| -rw-r--r-- | examples/simple-controller.c | 3 | ||||
| -rw-r--r-- | examples/simple-view.c | 3 | ||||
| -rw-r--r-- | gconf-editor/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 5 | ||||
| -rw-r--r-- | wrappers/guile/Makefile.am | 2 |
9 files changed, 25 insertions, 13 deletions
@@ -1,3 +1,19 @@ +2001-08-25 Darin Adler <darin@bentspoon.com> + + * backends/Makefile.am: + * examples/Makefile.am: + * gconf-editor/Makefile.am: + * tests/Makefile.am: + * wrappers/guile/Makefile.am: + Got rid of extra unneeded -I directives. + + * examples/basic-gconf-app.c: + * examples/simple-controller.c: + * examples/simple-view.c: + Changed includes to use the normal <gconf/*> format, because + that is both better for examples, and works fine when building + gconf too, without any special -I trickery. + 2001-08-19 Jesus Bravo Alvarez <jba@pobox.com> * configure.in: Added gl (Galician) to ALL_LINGUAS. diff --git a/backends/Makefile.am b/backends/Makefile.am index 484458d9..be79f4fd 100644 --- a/backends/Makefile.am +++ b/backends/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES= -I$(top_srcdir) -I$(top_builddir) -I$(top_builddir)/gconf \ +INCLUDES= -I$(top_srcdir) -I$(top_builddir) \ $(DEPENDENT_WITH_XML_CFLAGS) \ -DGCONF_ENABLE_INTERNALS=1 -DG_LOG_DOMAIN=\"GConf-Backends\" diff --git a/examples/Makefile.am b/examples/Makefile.am index 80f6211f..e2450d2b 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/gconf -I$(top_builddir)/gconf \ +INCLUDES=-I$(top_srcdir) -I$(top_builddir) \ $(DEPENDENT_WITH_GTK_CFLAGS) \ -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_SYSCONFDIR=\""$(sysconfdir)"\" diff --git a/examples/basic-gconf-app.c b/examples/basic-gconf-app.c index 9560a08a..b9e63fcf 100644 --- a/examples/basic-gconf-app.c +++ b/examples/basic-gconf-app.c @@ -41,8 +41,7 @@ was opened; it also resets the prefs dialog contents to those settings. */ -#include <gconf-client.h> /* Once GConf is installed, this should be - <gconf/gconf-client.h> */ +#include <gconf/gconf-client.h> #include <gtk/gtk.h> static GtkWidget* create_main_window(GConfClient* client); diff --git a/examples/simple-controller.c b/examples/simple-controller.c index 178376b1..cb42a97a 100644 --- a/examples/simple-controller.c +++ b/examples/simple-controller.c @@ -21,8 +21,7 @@ /* A very simple program that sets a single key value when you type it in an entry and press return */ -#include <gconf-client.h> /* Once GConf is installed, this should be - <gconf/gconf-client.h> */ +#include <gconf/gconf-client.h> #include <gtk/gtk.h> void diff --git a/examples/simple-view.c b/examples/simple-view.c index fb44a919..1d483d8a 100644 --- a/examples/simple-view.c +++ b/examples/simple-view.c @@ -20,8 +20,7 @@ /* A very simple program that monitors a single key for changes. */ -#include <gconf-client.h> /* Once GConf is installed, this should be - <gconf/gconf-client.h> */ +#include <gconf/gconf-client.h> #include <gtk/gtk.h> void diff --git a/gconf-editor/Makefile.am b/gconf-editor/Makefile.am index 91b00199..e633cc25 100644 --- a/gconf-editor/Makefile.am +++ b/gconf-editor/Makefile.am @@ -1,5 +1,5 @@ INCLUDES=-I$(top_srcdir) \ - -I$(includedir) $(GNOME_CFLAGS) $(OAF_CFLAGS) \ + $(GNOME_CFLAGS) $(OAF_CFLAGS) \ -DG_LOG_DOMAIN=\"GConfEd\" -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \ -I../intl -I$(top_srcdir)/intl -I$(top_srcdir)/gconf diff --git a/tests/Makefile.am b/tests/Makefile.am index f0bfdc30..54a55a27 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,9 +1,8 @@ EFENCE= -INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/gconf \ - -I$(top_builddir)/gconf \ - -I$(includedir) $(DEPENDENT_CFLAGS) \ +INCLUDES = -I$(top_srcdir) -I$(top_builddir) \ + $(DEPENDENT_CFLAGS) \ -DG_LOG_DOMAIN=\"GConf-Tests\" -DGCONF_ENABLE_INTERNALS=1 noinst_PROGRAMS=testgconf testlisteners testschemas testchangeset testencode testunique testpersistence testdirlist testaddress diff --git a/wrappers/guile/Makefile.am b/wrappers/guile/Makefile.am index 3682cdf9..18286076 100644 --- a/wrappers/guile/Makefile.am +++ b/wrappers/guile/Makefile.am @@ -2,7 +2,7 @@ gconfmoduledir = $(datadir)/guile/gconf # -I$(builddir) catches the .x files -INCLUDES = -I$(top_builddir)/wrappers/guile -I$(top_srcdir)/gconf -I$(includedir) $(GUILE_CFLAGS) $(OAF_CFLAGS) $(ORBIT_CFLAGS) $(GLIB_CFLAGS) \ +INCLUDES = -I$(top_builddir)/wrappers/guile -I$(top_srcdir)/gconf $(GUILE_CFLAGS) $(OAF_CFLAGS) $(ORBIT_CFLAGS) $(GLIB_CFLAGS) \ -DG_LOG_DOMAIN=\"libgconf-scm\" -DGCONF_GUILE_DIR=\""$(gconfmoduledir)"\" lib_LTLIBRARIES = libgconf-scm.la |