1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44
|
From: Colin Watson <cjwatson@ubuntu.com>
Date: Tue, 31 May 2011 10:35:04 +0200
Subject: ld-as-needed
Rearrange link order to work with 'ld --as-needed'.
Bug-Ubuntu: http://bugs.launchpad.net/bugs/771037
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627428
---
src/gdome_cpp_smart/test/Makefile.am | 2 +-
src/gdome_cpp_smart/test/Makefile.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/gdome_cpp_smart/test/Makefile.am b/src/gdome_cpp_smart/test/Makefile.am
index be25fd2..aeba674 100644
--- a/src/gdome_cpp_smart/test/Makefile.am
+++ b/src/gdome_cpp_smart/test/Makefile.am
@@ -6,9 +6,9 @@ basic_SOURCES = basic.cc
deep_SOURCES = deep.cc
LDADDS = \
- $(GDOME_LIBS) \
$(top_builddir)/src/gdome_cpp_smart/.libs/libgmetadom_gdome_cpp_smart.a \
$(top_builddir)/src/gdome_cpp_smart/libgmetadom_gdome_cpp_smart.la \
+ $(GDOME_LIBS) \
-lstdc++
test_LDADD = $(LDADDS)
diff --git a/src/gdome_cpp_smart/test/Makefile.in b/src/gdome_cpp_smart/test/Makefile.in
index 3476da5..d342ddb 100644
--- a/src/gdome_cpp_smart/test/Makefile.in
+++ b/src/gdome_cpp_smart/test/Makefile.in
@@ -217,9 +217,9 @@ test_SOURCES = main.cc
basic_SOURCES = basic.cc
deep_SOURCES = deep.cc
LDADDS = \
- $(GDOME_LIBS) \
$(top_builddir)/src/gdome_cpp_smart/.libs/libgmetadom_gdome_cpp_smart.a \
$(top_builddir)/src/gdome_cpp_smart/libgmetadom_gdome_cpp_smart.la \
+ $(GDOME_LIBS) \
-lstdc++
test_LDADD = $(LDADDS)
--
|