diff options
| author | Havoc Pennington <hp@redhat.com> | 2001-05-09 23:40:18 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@src.gnome.org> | 2001-05-09 23:40:18 +0000 |
| commit | e5bd4077d2d862edb810029cc09b83e90efae542 (patch) | |
| tree | bd8e8d04810420237e1066f7c9f67acc5ff374cc /examples | |
| parent | f276b40eca4206294fb4887b95d3a6c7ffe2daa2 (diff) | |
| download | gconf-e5bd4077d2d862edb810029cc09b83e90efae542.tar.gz | |
remove testgconfclient from build, should now be made nongraphical and
2001-05-09 Havoc Pennington <hp@redhat.com>
* gconf/Makefile.am: remove testgconfclient from build, should
now be made nongraphical and stuck in tests/
* Makefile.am (SUBDIRS): remove "wrappers" from subdirs
* configure.in: remove Guile cruft, fix up pkg-config usage
* acinclude.m4: Use the pkg-config macros, remove gnome-common
dependency. Requires CVS pkg-config, need a pkg-config release.
(Since OAF doesn't build against ORBit1 anyway, I figured why not
check this in too...)
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/examples/Makefile.am b/examples/Makefile.am index d1fb8808..80f6211f 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -1,6 +1,5 @@ INCLUDES=-I$(top_srcdir) -I$(top_srcdir)/gconf -I$(top_builddir)/gconf \ - -I$(top_srcdir)/wrappers/gtk -I$(top_builddir)/wrappers/gtk \ - $(GLIB_CFLAGS) $(OAF_CFLAGS) $(GMODULE_CFLAGS) $(GTK_CFLAGS) \ + $(DEPENDENT_WITH_GTK_CFLAGS) \ -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_SYSCONFDIR=\""$(sysconfdir)"\" EFENCE= @@ -13,7 +12,7 @@ endif noinst_PROGRAMS=$(GTK_EXAMPLES) -GTK_EXAMPLES_LINK= $(EFENCE) $(INTLLIBS) $(OAF_LIBS) $(GTK_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(EFENCE) +GTK_EXAMPLES_LINK= $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_GTK_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(EFENCE) basic_gconf_app_SOURCES = basic-gconf-app.c |