diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | tests/Makefile.am | 4 | ||||
| -rw-r--r-- | wrappers/gtk/Makefile.am | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,8 @@ +2000-02-22 Elliot Lee <sopwith@redhat.com> + * tests/Makefile.am: srcdir != builddir fix. + * wrappers/gtk/Makefile.am: Add libgconf-gtk.la to testgconfclient + deps so that 'make -j' builds will work correctly. + 2000-02-19 Havoc Pennington <hp@pobox.com> * gconf/gconf.c (try_to_contact_server): Make sure we always set diff --git a/tests/Makefile.am b/tests/Makefile.am index fb688483..36f8ee3b 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,7 +1,9 @@ EFENCE= -INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(includedir) $(ORBIT_CFLAGS) $(GLIB_CFLAGS) \ +INCLUDES = -I$(top_srcdir) -I$(top_builddir) -I$(top_srcdir)/gconf \ + -I$(top_builddir)/gconf \ + -I$(includedir) $(ORBIT_CFLAGS) $(GLIB_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/gtk/Makefile.am b/wrappers/gtk/Makefile.am index e9767064..d65b3c13 100644 --- a/wrappers/gtk/Makefile.am +++ b/wrappers/gtk/Makefile.am @@ -19,5 +19,5 @@ noinst_PROGRAMS= testgconfclient testgconfclient_SOURCES = testgconfclient.c +testgconfclient_DEPS=$(top_builddir)/gconf/libgconf.la libgconf-gtk.la testgconfclient_LDADD = $(ORBIT_LIBS) $(GTK_LIBS) $(top_builddir)/gconf/libgconf.la $(top_builddir)/wrappers/gtk/libgconf-gtk.la - |