updated patch.

libraries should not be passed in *LDFLAGS. automake puts *LDFLAGS before the object files.
--- ./libgksuui/Makefile.in.orig	2009-08-16 22:20:32.000000000 +0100
+++ ./libgksuui/Makefile.in	2010-12-16 16:07:22.000000000 +0000
@@ -46,7 +46,8 @@
 CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 LTLIBRARIES = $(noinst_LTLIBRARIES)
-libgksuui1_0_la_LIBADD =
+libgksuui1_0_la_LIBADD = `pkg-config --libs gtk+-2.0 gconf-2.0 x11`
+libgksuui1_0_la_LDFLAGS = -Wl,-O1
 am_libgksuui1_0_la_OBJECTS = gksuui-dialog.lo
 libgksuui1_0_la_OBJECTS = $(am_libgksuui1_0_la_OBJECTS)
 libgksuui1_0_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -56,6 +57,7 @@
 am_test_gksuui_OBJECTS = test-gksuui.$(OBJEXT)
 test_gksuui_OBJECTS = $(am_test_gksuui_OBJECTS)
 test_gksuui_DEPENDENCIES = libgksuui1.0.la
+test_gksuui_LDADD = libgksuui1.0.la `pkg-config --libs glib-2.0 x11`
 test_gksuui_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(test_gksuui_LDFLAGS) $(LDFLAGS) -o $@
@@ -233,7 +235,7 @@
 noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
 test_gksuui_SOURCES = test-gksuui.c
 test_gksuui_LDADD = libgksuui1.0.la
-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
+test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0 x11`
 all: all-am
 
 .SUFFIXES:
--- ./libgksuui/Makefile.am.orig	2010-12-16 15:54:17.000000000 +0000
+++ ./libgksuui/Makefile.am	2010-12-16 16:02:20.000000000 +0000
@@ -4,12 +4,13 @@
 
 noinst_LTLIBRARIES = libgksuui1.0.la
 libgksuui1_0_la_SOURCES = gksuui-dialog.c
-libgksuui1_0_la_LDFLAGS = -Wl,-O1 `pkg-config --libs gtk+-2.0 gconf-2.0`
+libgksuui1_0_la_LDFLAGS = -Wl,-O1
+libgksuui1_0_la_LIBADD = `pkg-config --libs gtk+-2.0 gconf-2.0 x11`
 
 noinst_HEADERS = defines.h gksuui.h gksuui-dialog.h
 includedir = ${prefix}/include/$(PACKAGE)
 
 noinst_PROGRAMS = test-gksuui
 test_gksuui_SOURCES = test-gksuui.c
-test_gksuui_LDADD = libgksuui1.0.la
-test_gksuui_LDFLAGS = `pkg-config --libs glib-2.0`
+test_gksuui_LDADD = libgksuui1.0.la `pkg-config --libs glib-2.0 x11`
+test_gksuui_LDFLAGS =
--- ./libgksu/Makefile.in.orig	2009-08-16 22:20:32.000000000 +0100
+++ ./libgksu/Makefile.in	2010-12-16 16:01:27.000000000 +0000
@@ -261,18 +261,19 @@
 # major -> breaks backward compatibility (changes to existing ABI)
 # minor -> keeps compatibility (additions to the API)
 # micro -> no change to the API/ABI
-libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la
-libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil \
-	${LIBGKSU_LIBS} $(am__append_2)
+libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS} 
+libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 \
+	$(am__append_2)
 noinst_HEADERS = defines.h
 include_HEADERS = gksu.h libgksu.h
 pkgconfigdir = ${libdir}/pkgconfig
 pkgconfig_DATA = libgksu2.pc
-gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
+gksu_run_helper_LDFLAGS =
+gksu_run_helper_LDADD = `pkg-config --libs glib-2.0`
 gksu_run_helper_SOURCES = gksu-run-helper.c
 test_gksu_SOURCES = test-gksu.c
-test_gksu_LDADD = libgksu2.la
-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
+test_gksu_LDADD = libgksu2.la `pkg-config --libs gtk+-2.0`
+test_gksu_LDFLAGS =
 EXTRA_DIST = libgksu.ver
 all: all-am
 
--- ./libgksu/Makefile.am.orig	2009-08-16 22:20:16.000000000 +0100
+++ ./libgksu/Makefile.am	2010-12-16 16:00:10.000000000 +0000
@@ -12,8 +12,8 @@
 # major -> breaks backward compatibility (changes to existing ABI)
 # minor -> keeps compatibility (additions to the API)
 # micro -> no change to the API/ABI
-libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la
-libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1 -lutil ${LIBGKSU_LIBS}
+libgksu2_la_LIBADD = ../libgksuui/libgksuui1.0.la -lutil ${LIBGKSU_LIBS}
+libgksu2_la_LDFLAGS = -version-info 0:2:0 -Wl,-O1
 if USE_VERSION_SCRIPT
 libgksu2_la_LDFLAGS += -Wl,--version-script=libgksu.ver
 endif
@@ -28,12 +28,13 @@
 
 pkglibdir = ${libdir}/${PACKAGE}
 pkglib_PROGRAMS = gksu-run-helper
-gksu_run_helper_LDFLAGS = `pkg-config --libs glib-2.0`
+gksu_run_helper_LDFLAGS =
+gksu_run_helper_LDADD = `pkg-config --libs glib-2.0`
 gksu_run_helper_SOURCES = gksu-run-helper.c
 
 noinst_PROGRAMS = test-gksu
 test_gksu_SOURCES = test-gksu.c
-test_gksu_LDADD = libgksu2.la
-test_gksu_LDFLAGS = `pkg-config --libs glib-2.0`
+test_gksu_LDADD = libgksu2.la `pkg-config --libs gtk+-2.0`
+test_gksu_LDFLAGS =
 
 EXTRA_DIST = libgksu.ver

Reply via email to