|
|
@@ -1,24 +1,24 @@
|
|
|
Index: backends/Makefile.in
|
|
|
---- backends/Makefile.in.orig 2004-04-19 14:11:07.000000000 +0200
|
|
|
-+++ backends/Makefile.in 2004-05-20 11:29:07.000000000 +0200
|
|
|
-@@ -189,7 +189,7 @@
|
|
|
- gconf_merge_tree_OBJECTS = gconf-merge-tree.$(OBJEXT)
|
|
|
- gconf_merge_tree_DEPENDENCIES = \
|
|
|
- $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
|
|
|
--gconf_merge_tree_LDFLAGS =
|
|
|
+--- backends/Makefile.in.orig 2004-09-14 21:36:46 +0200
|
|
|
++++ backends/Makefile.in 2004-10-11 14:23:31 +0200
|
|
|
+@@ -256,7 +256,7 @@
|
|
|
+ gconf_merge_tree_OBJECTS = $(am_gconf_merge_tree_OBJECTS)
|
|
|
+ gconf_merge_tree_DEPENDENCIES = \
|
|
|
+ $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
|
|
|
+-gconf_merge_tree_LDFLAGS =
|
|
|
+gconf_merge_tree_LDFLAGS = -static
|
|
|
- xml_test_OBJECTS = xml-cache.$(OBJEXT) xml-dir.$(OBJEXT) \
|
|
|
- xml-entry.$(OBJEXT) xml-backend.$(OBJEXT) xml-test.$(OBJEXT)
|
|
|
- xml_test_DEPENDENCIES = \
|
|
|
+ am_xml_test_OBJECTS = xml-test.$(OBJEXT)
|
|
|
+ xml_test_OBJECTS = $(am_xml_test_OBJECTS)
|
|
|
+ xml_test_DEPENDENCIES = \
|
|
|
Index: gconf/Makefile.in
|
|
|
---- gconf/Makefile.in.orig 2004-04-19 14:11:03.000000000 +0200
|
|
|
-+++ gconf/Makefile.in 2004-05-20 11:28:48.000000000 +0200
|
|
|
-@@ -221,7 +221,7 @@
|
|
|
-
|
|
|
- gconftool_2_OBJECTS = gconftool.$(OBJEXT)
|
|
|
- gconftool_2_DEPENDENCIES = libgconf-$(MAJOR_VERSION).la
|
|
|
--gconftool_2_LDFLAGS =
|
|
|
+--- gconf/Makefile.in.orig 2004-09-14 21:36:47 +0200
|
|
|
++++ gconf/Makefile.in 2004-10-11 14:23:43 +0200
|
|
|
+@@ -330,7 +330,7 @@
|
|
|
+ am_gconftool_2_OBJECTS = gconftool.$(OBJEXT)
|
|
|
+ gconftool_2_OBJECTS = $(am_gconftool_2_OBJECTS)
|
|
|
+ gconftool_2_DEPENDENCIES = libgconf-$(MAJOR_VERSION).la
|
|
|
+-gconftool_2_LDFLAGS =
|
|
|
+gconftool_2_LDFLAGS = -static
|
|
|
- gconfd_2_OBJECTS = gconf-database.$(OBJEXT) gconfd.$(OBJEXT)
|
|
|
- gconfd_2_DEPENDENCIES = libgconf-$(MAJOR_VERSION).la
|
|
|
- gconfd_2_LDFLAGS =
|
|
|
+
|
|
|
+ DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
|
|
|
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
|