head	1.7;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.3
	OPENPKG_E1_MP:1.3
	OPENPKG_E1_MP_2_STABLE:1.2.10.1
	OPENPKG_E1_FP:1.2.10.1
	OPENPKG_2_STABLE_MP:1.3
	OPENPKG_2_STABLE_20061018:1.2.10.1
	OPENPKG_2_STABLE_20060622:1.2
	OPENPKG_2_STABLE:1.2.0.10
	OPENPKG_2_STABLE_BP:1.2
	OPENPKG_2_5_RELEASE:1.2
	OPENPKG_2_5_SOLID:1.2.0.8
	OPENPKG_2_5_SOLID_BP:1.2
	OPENPKG_2_4_RELEASE:1.2
	OPENPKG_2_4_SOLID:1.2.0.6
	OPENPKG_2_4_SOLID_BP:1.2
	OPENPKG_CW_FP:1.2
	OPENPKG_2_3_RELEASE:1.2
	OPENPKG_2_3_SOLID:1.2.0.4
	OPENPKG_2_3_SOLID_BP:1.2
	OPENPKG_2_2_RELEASE:1.2
	OPENPKG_2_2_SOLID:1.2.0.2
	OPENPKG_2_2_SOLID_BP:1.2;
locks; strict;
comment	@# @;


1.7
date	2007.09.21.06.30.53;	author cs;	state Exp;
branches;
next	1.6;
commitid	nkwYtj1GIRcUjzys;

1.6
date	2007.06.23.17.54.19;	author rse;	state Exp;
branches;
next	1.5;
commitid	S2KgaG53QYFJZ3ns;

1.5
date	2007.03.06.08.46.21;	author rse;	state Exp;
branches;
next	1.4;
commitid	YBmwf5TfNnBXs09s;

1.4
date	2007.02.27.07.29.52;	author rse;	state Exp;
branches;
next	1.3;
commitid	vfGX44ZFA2IGg68s;

1.3
date	2006.10.05.20.12.10;	author rse;	state Exp;
branches;
next	1.2;
commitid	sYJlXGvDZxRa9xPr;

1.2
date	2004.10.11.12.27.02;	author rse;	state Exp;
branches
	1.2.10.1;
next	1.1;

1.1
date	2004.05.20.09.39.28;	author rse;	state Exp;
branches;
next	;

1.2.10.1
date	2006.10.16.14.50.17;	author rse;	state Exp;
branches;
next	;
commitid	iZxwRSmmWscPXUQr;


desc
@@


1.7
log
@upgrading package: gconf 2.19.1 -> 2.20.0
@
text
@Index: backends/Makefile.in
--- backends/Makefile.in.orig	2007-09-19 16:19:59 +0200
+++ backends/Makefile.in	2007-09-21 08:17:08 +0200
@@@@ -318,25 +318,25 @@@@
 	xml-entry.c		\
 	xml-backend.c
 
-libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module -no-undefined
-libgconfbackend_oldxml_la_LIBADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(INTLLIBS)
+libgconfbackend_oldxml_la_LDFLAGS = -avoid-version -module
+libgconfbackend_oldxml_la_LIBADD = $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(DEPENDENT_WITH_XML_LIBS) $(INTLLIBS)
 libgconfbackend_xml_la_SOURCES = \
 	markup-backend.c		\
 	markup-tree.h			\
 	markup-tree.c
 
-libgconfbackend_xml_la_LDFLAGS = -avoid-version -module -no-undefined
-libgconfbackend_xml_la_LIBADD = $(DEPENDENT_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(INTLLIBS)
+libgconfbackend_xml_la_LDFLAGS = -avoid-version -module
+libgconfbackend_xml_la_LIBADD = $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(DEPENDENT_LIBS) $(INTLLIBS)
 xml_test_SOURCES = xml-test.c
 xml_test_LDADD = \
-	$(DEPENDENT_WITH_XML_LIBS) \
 	$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
-	libgconfbackend-oldxml.la
+	libgconfbackend-oldxml.la \
+	$(DEPENDENT_WITH_XML_LIBS)
 
 gconf_merge_tree_SOURCES = gconf-merge-tree.c
-gconf_merge_tree_LDADD = $(DEPENDENT_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
+gconf_merge_tree_LDADD = $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(DEPENDENT_LIBS)
 @@LDAP_SUPPORT_TRUE@@libgconfbackend_evoldap_la_SOURCES = evoldap-backend.c
-@@LDAP_SUPPORT_TRUE@@libgconfbackend_evoldap_la_LDFLAGS = -avoid-version -module -no-undefined
+@@LDAP_SUPPORT_TRUE@@libgconfbackend_evoldap_la_LDFLAGS = -avoid-version -module
 @@LDAP_SUPPORT_TRUE@@libgconfbackend_evoldap_la_LIBADD = \
 @@LDAP_SUPPORT_TRUE@@	$(DEPENDENT_WITH_XML_LIBS) \
 @@LDAP_SUPPORT_TRUE@@	$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
@@@@ -455,10 +455,10 @@@@
 	done
 gconf-merge-tree$(EXEEXT): $(gconf_merge_tree_OBJECTS) $(gconf_merge_tree_DEPENDENCIES) 
 	@@rm -f gconf-merge-tree$(EXEEXT)
-	$(LINK) $(gconf_merge_tree_OBJECTS) $(gconf_merge_tree_LDADD) $(LIBS)
+	$(LINK) -static $(gconf_merge_tree_OBJECTS) $(gconf_merge_tree_LDADD) $(LIBS)
 xml-test$(EXEEXT): $(xml_test_OBJECTS) $(xml_test_DEPENDENCIES) 
 	@@rm -f xml-test$(EXEEXT)
-	$(LINK) $(xml_test_OBJECTS) $(xml_test_LDADD) $(LIBS)
+	$(LINK) -static $(xml_test_OBJECTS) $(xml_test_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
Index: gconf/Makefile.in
--- gconf/Makefile.in.orig	2007-09-19 16:19:59 +0200
+++ gconf/Makefile.in	2007-09-21 08:22:18 +0200
@@@@ -345,7 +345,7 @@@@
 	gconfd.h		\
 	gconfd.c
 
-gconfd_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_LIBS) libgconf-$(MAJOR_VERSION).la
+gconfd_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) $(DEPENDENT_LIBS)
 
 # gconf_testclient_SOURCES = \
 # 	testclient.c
@@@@ -354,11 +354,11 @@@@
 gconftool_2_SOURCES = \
 	gconftool.c
 
-gconftool_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_LIBS) libgconf-$(MAJOR_VERSION).la
+gconftool_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_LIBS)
 gconf_sanity_check_2_SOURCES = \
 	gconf-sanity-check.c
 
-gconf_sanity_check_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_AND_GTK_LIBS) libgconf-$(MAJOR_VERSION).la
+gconf_sanity_check_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_AND_GTK_LIBS)
 @@OS_WIN32_TRUE@@WIN32_SOURCECODE = dllmain.c
 libgconf_2_la_SOURCES = \
 	gconf-internals.c	\
@@@@ -379,7 +379,7 @@@@
 	$(CORBA_SOURCECODE)	\
 	$(WIN32_SOURCECODE)
 
-libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE) -no-undefined
+libgconf_2_la_LDFLAGS = -version-info $(GCONF_CURRENT):$(GCONF_REVISION):$(GCONF_AGE)
 libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS)
 EXTRA_DIST = GConfX.idl default.path.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh
 all: $(BUILT_SOURCES)
@@@@ -503,13 +503,13 @@@@
 	done
 gconf-sanity-check-2$(EXEEXT): $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_DEPENDENCIES) 
 	@@rm -f gconf-sanity-check-2$(EXEEXT)
-	$(LINK) $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_LDADD) $(LIBS)
+	$(LINK) -static $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_LDADD) $(LIBS)
 gconfd-2$(EXEEXT): $(gconfd_2_OBJECTS) $(gconfd_2_DEPENDENCIES) 
 	@@rm -f gconfd-2$(EXEEXT)
-	$(LINK) $(gconfd_2_OBJECTS) $(gconfd_2_LDADD) $(LIBS)
+	$(LINK) -static $(gconfd_2_OBJECTS) $(gconfd_2_LDADD) $(LIBS)
 gconftool-2$(EXEEXT): $(gconftool_2_OBJECTS) $(gconftool_2_DEPENDENCIES) 
 	@@rm -f gconftool-2$(EXEEXT)
-	$(LINK) $(gconftool_2_OBJECTS) $(gconftool_2_LDADD) $(LIBS)
+	$(LINK) -static $(gconftool_2_OBJECTS) $(gconftool_2_LDADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@


1.6
log
@upgrading package: gconf 2.18.0.1 -> 2.19.1
@
text
@d2 3
a4 3
--- backends/Makefile.in.orig	2007-06-23 15:11:08 +0200
+++ backends/Makefile.in	2007-06-23 19:49:32 +0200
@@@@ -319,23 +319,23 @@@@
d31 1
a31 1
+gconf_merge_tree_LDADD = $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(DEPENDENT_LIBS) 
d33 2
a34 1
 @@LDAP_SUPPORT_TRUE@@libgconfbackend_evoldap_la_LDFLAGS = -avoid-version -module -no-undefined
d36 3
a38 1
@@@@ -456,10 +456,10 @@@@
d42 2
a43 2
-	$(LINK) $(gconf_merge_tree_LDFLAGS) $(gconf_merge_tree_OBJECTS) $(gconf_merge_tree_LDADD) $(LIBS)
+	$(LINK) -static $(gconf_merge_tree_LDFLAGS) $(gconf_merge_tree_OBJECTS) $(gconf_merge_tree_LDADD) $(LIBS)
d46 2
a47 2
-	$(LINK) $(xml_test_LDFLAGS) $(xml_test_OBJECTS) $(xml_test_LDADD) $(LIBS)
+	$(LINK) -static $(xml_test_LDFLAGS) $(xml_test_OBJECTS) $(xml_test_LDADD) $(LIBS)
d52 3
a54 3
--- gconf/Makefile.in.orig	2007-06-23 15:11:10 +0200
+++ gconf/Makefile.in	2007-06-23 19:50:00 +0200
@@@@ -354,7 +354,7 @@@@
d63 1
a63 1
@@@@ -363,11 +363,11 @@@@
d68 1
a68 1
+gconftool_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_LIBS) 
d77 1
a77 1
@@@@ -388,7 +388,7 @@@@
d86 1
a86 1
@@@@ -512,13 +512,13 @@@@
d90 2
a91 2
-	$(LINK) $(gconf_sanity_check_2_LDFLAGS) $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_LDADD) $(LIBS)
+	$(LINK) -static $(gconf_sanity_check_2_LDFLAGS) $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_LDADD) $(LIBS)
d94 2
a95 2
-	$(LINK) $(gconfd_2_LDFLAGS) $(gconfd_2_OBJECTS) $(gconfd_2_LDADD) $(LIBS)
+	$(LINK) -static $(gconfd_2_LDFLAGS) $(gconfd_2_OBJECTS) $(gconfd_2_LDADD) $(LIBS)
d98 2
a99 2
-	$(LINK) $(gconftool_2_LDFLAGS) $(gconftool_2_OBJECTS) $(gconftool_2_LDADD) $(LIBS)
+	$(LINK) -static $(gconftool_2_LDFLAGS) $(gconftool_2_OBJECTS) $(gconftool_2_LDADD) $(LIBS)
@


1.5
log
@upgrading package: gconf 2.16.1 -> 2.18.0.1
@
text
@d2 3
a4 3
--- backends/Makefile.in.orig	2007-03-05 17:27:24 +0100
+++ backends/Makefile.in	2007-03-06 09:36:04 +0100
@@@@ -321,23 +321,23 @@@@
d35 1
a35 1
@@@@ -458,10 +458,10 @@@@
d39 2
a40 2
-	$(LINK) $(gconf_merge_tree_OBJECTS) $(gconf_merge_tree_LDADD) $(LIBS)
+	$(LINK) -static $(gconf_merge_tree_OBJECTS) $(gconf_merge_tree_LDADD) $(LIBS)
d43 2
a44 2
-	$(LINK) $(xml_test_OBJECTS) $(xml_test_LDADD) $(LIBS)
+	$(LINK) -static $(xml_test_OBJECTS) $(xml_test_LDADD) $(LIBS)
d49 3
a51 3
--- gconf/Makefile.in.orig	2007-03-05 17:27:25 +0100
+++ gconf/Makefile.in	2007-03-06 09:31:42 +0100
@@@@ -348,7 +348,7 @@@@
d60 1
a60 1
@@@@ -357,11 +357,11 @@@@
d74 1
a74 1
@@@@ -382,7 +382,7 @@@@
d83 1
a83 1
@@@@ -506,13 +506,13 @@@@
d87 2
a88 2
-	$(LINK) $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_LDADD) $(LIBS)
+	$(LINK) -static $(gconf_sanity_check_2_OBJECTS) $(gconf_sanity_check_2_LDADD) $(LIBS)
d91 2
a92 2
-	$(LINK) $(gconfd_2_OBJECTS) $(gconfd_2_LDADD) $(LIBS)
+	$(LINK) -static $(gconfd_2_OBJECTS) $(gconfd_2_LDADD) $(LIBS)
d95 2
a96 2
-	$(LINK) $(gconftool_2_OBJECTS) $(gconftool_2_LDADD) $(LIBS)
+	$(LINK) -static $(gconftool_2_OBJECTS) $(gconftool_2_LDADD) $(LIBS)
@


1.4
log
@upgrading package: gconf 2.16.0 -> 2.16.1
@
text
@d2 4
a5 3
--- backends/Makefile.in.orig	2006-10-05 14:48:26.000000000 +0200
+++ backends/Makefile.in	2006-10-24 17:31:57.470159499 +0200
@@@@ -241,7 +241,7 @@@@
a7 1
 
d9 1
d11 1
a11 2
 libgconfbackend_oldxml_la_LIBADD = $(DEPENDENT_WITH_XML_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(INTLLIBS)
 
d13 2
a14 1
@@@@ -250,24 +250,24 @@@@
a16 1
 
d18 1
d20 1
a20 4
 libgconfbackend_xml_la_LIBADD = $(DEPENDENT_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(INTLLIBS)
 
 noinst_PROGRAMS = xml-test
 
a28 2
 
 bin_PROGRAMS = gconf-merge-tree
d31 1
a31 2
+gconf_merge_tree_LDADD = $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(DEPENDENT_LIBS)
 
d33 1
a33 2
-@@LDAP_SUPPORT_TRUE@@libgconfbackend_evoldap_la_LDFLAGS = -avoid-version -module -no-undefined
+@@LDAP_SUPPORT_TRUE@@libgconfbackend_evoldap_la_LDFLAGS = -avoid-version -module
d35 10
a44 15
 @@LDAP_SUPPORT_TRUE@@	$(DEPENDENT_WITH_XML_LIBS) \
 @@LDAP_SUPPORT_TRUE@@	$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
@@@@ -319,13 +319,13 @@@@
 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
 am_xml_test_OBJECTS = xml-test.$(OBJEXT)
 xml_test_OBJECTS = $(am_xml_test_OBJECTS)
 xml_test_DEPENDENCIES = \
 	$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
 	libgconfbackend-oldxml.la
-xml_test_LDFLAGS =
+xml_test_LDFLAGS = -static
d46 2
a47 2
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
d49 4
a52 3
--- gconf/Makefile.in.orig	2006-10-05 14:54:51.000000000 +0200
+++ gconf/Makefile.in	2006-10-24 17:31:41.092121605 +0200
@@@@ -291,7 +291,7 @@@@
a54 1
 
a57 1
 
d59 3
a61 1
@@@@ -302,13 +302,13 @@@@
a63 1
 
d65 1
a65 2
+gconftool_2_LDADD =  libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_LIBS)
 
a68 1
 
a70 1
 
d72 4
a75 2
 
@@@@ -332,7 +332,7 @@@@
a77 1
 
a79 1
 
d81 16
d98 2
a99 19
@@@@ -368,15 +368,15 @@@@
 am_gconf_sanity_check_2_OBJECTS = gconf-sanity-check.$(OBJEXT)
 gconf_sanity_check_2_OBJECTS = $(am_gconf_sanity_check_2_OBJECTS)
 gconf_sanity_check_2_DEPENDENCIES = libgconf-$(MAJOR_VERSION).la
-gconf_sanity_check_2_LDFLAGS =
+gconf_sanity_check_2_LDFLAGS = -static
 am_gconfd_2_OBJECTS = gconf-database.$(OBJEXT) gconfd.$(OBJEXT)
 gconfd_2_OBJECTS = $(am_gconfd_2_OBJECTS)
 gconfd_2_DEPENDENCIES = libgconf-$(MAJOR_VERSION).la
-gconfd_2_LDFLAGS =
+gconfd_2_LDFLAGS = -static
 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
 
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@


1.3
log
@upgrading package: gconf 2.13.5 -> 2.16.0
@
text
@d2 20
a21 3
--- backends/Makefile.in.orig	2006-10-05 14:48:26 +0200
+++ backends/Makefile.in	2006-10-05 22:10:03 +0200
@@@@ -257,14 +257,14 @@@@
d38 5
a42 1
 @@LDAP_SUPPORT_TRUE@@libgconfbackend_evoldap_la_LDFLAGS = -avoid-version -module -no-undefined
d60 2
a61 2
--- gconf/Makefile.in.orig	2006-10-05 14:54:51 +0200
+++ gconf/Makefile.in	2006-10-05 22:07:26 +0200
d87 9
@


1.2
log
@upgrade and bless for PLUS class
@
text
@d2 21
a22 3
--- 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 @@@@
d31 7
d39 38
a76 3
--- 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 @@@@
@


1.2.10.1
log
@Mass merge from CURRENT to 2-STABLE (all packages except those of JUNK class)
@
text
@d2 3
a4 21
--- backends/Makefile.in.orig	2006-10-05 14:48:26 +0200
+++ backends/Makefile.in	2006-10-05 22:10:03 +0200
@@@@ -257,14 +257,14 @@@@
 
 xml_test_SOURCES = xml-test.c
 xml_test_LDADD = \
-	$(DEPENDENT_WITH_XML_LIBS) \
 	$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
-	libgconfbackend-oldxml.la
+	libgconfbackend-oldxml.la \
+	$(DEPENDENT_WITH_XML_LIBS)
 
 
 bin_PROGRAMS = gconf-merge-tree
 gconf_merge_tree_SOURCES = gconf-merge-tree.c
-gconf_merge_tree_LDADD = $(DEPENDENT_LIBS) $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la
+gconf_merge_tree_LDADD = $(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la $(DEPENDENT_LIBS)
 
 @@LDAP_SUPPORT_TRUE@@libgconfbackend_evoldap_la_SOURCES = evoldap-backend.c
 @@LDAP_SUPPORT_TRUE@@libgconfbackend_evoldap_la_LDFLAGS = -avoid-version -module -no-undefined
@@@@ -319,13 +319,13 @@@@
a12 7
 	$(top_builddir)/gconf/libgconf-$(MAJOR_VERSION).la \
 	libgconfbackend-oldxml.la
-xml_test_LDFLAGS =
+xml_test_LDFLAGS = -static
 
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
d14 3
a16 38
--- gconf/Makefile.in.orig	2006-10-05 14:54:51 +0200
+++ gconf/Makefile.in	2006-10-05 22:07:26 +0200
@@@@ -291,7 +291,7 @@@@
 	gconfd.c
 
 
-gconfd_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_LIBS) libgconf-$(MAJOR_VERSION).la
+gconfd_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) $(DEPENDENT_LIBS)
 
 
 # gconf_testclient_SOURCES = \
@@@@ -302,13 +302,13 @@@@
 	gconftool.c
 
 
-gconftool_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_LIBS) libgconf-$(MAJOR_VERSION).la
+gconftool_2_LDADD =  libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_LIBS)
 
 gconf_sanity_check_2_SOURCES = \
 	gconf-sanity-check.c
 
 
-gconf_sanity_check_2_LDADD = $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_AND_GTK_LIBS) libgconf-$(MAJOR_VERSION).la
+gconf_sanity_check_2_LDADD = libgconf-$(MAJOR_VERSION).la $(EFENCE) $(INTLLIBS) $(DEPENDENT_WITH_XML_AND_GTK_LIBS)
 
 @@OS_WIN32_TRUE@@WIN32_SOURCECODE = dllmain.c
 
@@@@ -368,15 +368,15 @@@@
 am_gconf_sanity_check_2_OBJECTS = gconf-sanity-check.$(OBJEXT)
 gconf_sanity_check_2_OBJECTS = $(am_gconf_sanity_check_2_OBJECTS)
 gconf_sanity_check_2_DEPENDENCIES = libgconf-$(MAJOR_VERSION).la
-gconf_sanity_check_2_LDFLAGS =
+gconf_sanity_check_2_LDFLAGS = -static
 am_gconfd_2_OBJECTS = gconf-database.$(OBJEXT) gconfd.$(OBJEXT)
 gconfd_2_OBJECTS = $(am_gconfd_2_OBJECTS)
 gconfd_2_DEPENDENCIES = libgconf-$(MAJOR_VERSION).la
-gconfd_2_LDFLAGS =
+gconfd_2_LDFLAGS = -static
@


1.1
log
@new package: gconf 2.6.1 (GNOME Configuration/Preference Facility)
@
text
@d2 7
a8 7
--- 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 = 
d10 3
a12 3
 xml_test_OBJECTS =  xml-cache.$(OBJEXT) xml-dir.$(OBJEXT) \
 xml-entry.$(OBJEXT) xml-backend.$(OBJEXT) xml-test.$(OBJEXT)
 xml_test_DEPENDENCIES =  \
d14 8
a21 3
--- 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 @@@@
d23 2
a24 7
 gconftool_2_OBJECTS =  gconftool.$(OBJEXT)
 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 = 
@