From: cantor <cantor@cb58f699-b61c-0410-a6fe-9272a202ed29>
Date: Fri, 19 Nov 2010 20:57:18 +0000 (+0000)
Subject: Hopefully proper use of LIBADD to fix LDFLAG ordering problems.
X-Git-Tag: 2.4.2~24
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=shibboleth%2Fsp.git;a=commitdiff_plain;h=fa05e5e67e60ef7d53ba012553ff370b6002d3b1

Hopefully proper use of LIBADD to fix LDFLAG ordering problems.

git-svn-id: https://svn.middleware.georgetown.edu/cpp-sp/branches/REL_2@3378 cb58f699-b61c-0410-a6fe-9272a202ed29
---

diff --git a/adfs/Makefile.am b/adfs/Makefile.am
index e6aa05c..cd3ade5 100644
--- a/adfs/Makefile.am
+++ b/adfs/Makefile.am
@@ -3,20 +3,20 @@ AUTOMAKE_OPTIONS = foreign
 plugindir = $(libdir)/@PACKAGE@
 plugin_LTLIBRARIES = adfs.la adfs-lite.la
 
-adfs_la_LIBADD = \
+adfs_la_LIBADD = $(XMLSEC_LIBS) \
 	$(top_builddir)/shibsp/libshibsp.la
 
 adfs_la_SOURCES = \
 	adfs.cpp
 
-adfs_lite_la_LIBADD = \
+adfs_lite_la_LIBADD = $(LITE_LIBS) \
 	$(top_builddir)/shibsp/libshibsp-lite.la
 
 adfs_lite_la_SOURCES = \
 	adfs.cpp
 
-adfs_la_LDFLAGS = -module -avoid-version $(XMLSEC_LIBS)
-adfs_lite_la_LDFLAGS = -module -avoid-version $(LITE_LIBS)
+adfs_la_LDFLAGS = -module -avoid-version
+adfs_lite_la_LDFLAGS = -module -avoid-version
 adfs_lite_la_CPPFLAGS = -DSHIBSP_LITE
 
 install-exec-hook:
diff --git a/apache/Makefile.am b/apache/Makefile.am
index 0af9efe..0e010f1 100644
--- a/apache/Makefile.am
+++ b/apache/Makefile.am
@@ -5,8 +5,8 @@ modshib13dir = $(libdir)/@PACKAGE@
 modshib13_LTLIBRARIES = mod_shib_13.la
 mod_shib_13_la_SOURCES = mod_shib_13.cpp
 mod_shib_13_la_CXXFLAGS = $(APXS_CFLAGS) -I$(APXS_INCLUDE)
-mod_shib_13_la_LDFLAGS = $(LITE_LIBS) -module -avoid-version
-mod_shib_13_la_LIBADD = \
+mod_shib_13_la_LDFLAGS = -module -avoid-version
+mod_shib_13_la_LIBADD = $(LITE_LIBS) \
   $(top_builddir)/shibsp/libshibsp-lite.la
 
 install-exec-hook:
@@ -19,8 +19,8 @@ modshib20dir = $(libdir)/@PACKAGE@
 modshib20_LTLIBRARIES = mod_shib_20.la
 mod_shib_20_la_SOURCES = mod_shib_20.cpp
 mod_shib_20_la_CXXFLAGS = $(APXS2_CFLAGS) -I$(APXS2_INCLUDE)
-mod_shib_20_la_LDFLAGS = $(LITE_LIBS) -module -avoid-version
-mod_shib_20_la_LIBADD = \
+mod_shib_20_la_LDFLAGS = -module -avoid-version
+mod_shib_20_la_LIBADD = $(LITE_LIBS) \
   $(top_builddir)/shibsp/libshibsp-lite.la
 
 install-exec-hook:
@@ -33,8 +33,8 @@ modshib22dir = $(libdir)/@PACKAGE@
 modshib22_LTLIBRARIES = mod_shib_22.la
 mod_shib_22_la_SOURCES = mod_shib_22.cpp
 mod_shib_22_la_CXXFLAGS = $(APXS22_CFLAGS) -I$(APXS22_INCLUDE)
-mod_shib_22_la_LDFLAGS = $(LITE_LIBS) -module -avoid-version
-mod_shib_22_la_LIBADD = \
+mod_shib_22_la_LDFLAGS = -module -avoid-version
+mod_shib_22_la_LIBADD = $(LITE_LIBS) \
   $(top_builddir)/shibsp/libshibsp-lite.la
 
 install-exec-hook:
diff --git a/fastcgi/Makefile.am b/fastcgi/Makefile.am
index 232c0b7..bdf5994 100644
--- a/fastcgi/Makefile.am
+++ b/fastcgi/Makefile.am
@@ -8,14 +8,14 @@ fastcgi_PROGRAMS = shibauthorizer shibresponder
 
 shibauthorizer_SOURCES = shibauthorizer.cpp
 shibauthorizer_CXXFLAGS = -I$(FASTCGI_INCLUDE)
-shibauthorizer_LDFLAGS = $(FASTCGI_LDFLAGS) $(FASTCGI_LIBS)
-shibauthorizer_LDADD = \
+shibauthorizer_LDFLAGS = $(FASTCGI_LDFLAGS)
+shibauthorizer_LIBADD = $(FASTCGI_LIBS) \
   $(top_builddir)/shibsp/libshibsp-lite.la
 
 shibresponder_SOURCES = shibresponder.cpp
 shibresponder_CXXFLAGS = -I$(FASTCGI_INCLUDE)
-shibresponder_LDFLAGS = $(FASTCGI_LDFLAGS) $(FASTCGI_LIBS)
-shibresponder_LDADD = \
+shibresponder_LDFLAGS = $(FASTCGI_LDFLAGS)
+shibresponder_LIBADD = $(FASTCGI_LIBS) \
   $(top_builddir)/shibsp/libshibsp-lite.la
 
 endif
diff --git a/memcache-store/Makefile.am b/memcache-store/Makefile.am
index db992f5..d1c4286 100644
--- a/memcache-store/Makefile.am
+++ b/memcache-store/Makefile.am
@@ -6,13 +6,12 @@ plugin_LTLIBRARIES = memcache-store.la
 AM_CFLAGS = $(MEMCACHED_CFLAGS)
 AM_CXXFLAGS = $(MEMCACHED_CFLAGS)
 
-memcache_store_la_LIBADD = \
-	$(MEMCACHED_LIBS)
+memcache_store_la_LIBADD = $(XMLSEC_LIBS) $(MEMCACHED_LIBS)
 
 memcache_store_la_SOURCES = \
 	memcache-store.cpp
 
-memcache_store_la_LDFLAGS = -module -avoid-version $(XMLSEC_LIBS)
+memcache_store_la_LDFLAGS = -module -avoid-version
 
 install-exec-hook:
 	for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
diff --git a/nsapi_shib/Makefile.am b/nsapi_shib/Makefile.am
index 17b36f5..f9af5b5 100644
--- a/nsapi_shib/Makefile.am
+++ b/nsapi_shib/Makefile.am
@@ -5,8 +5,8 @@ nsapi_shibdir = $(libdir)/@PACKAGE@
 nsapi_shib_LTLIBRARIES = nsapi_shib.la
 nsapi_shib_la_SOURCES = nsapi_shib.cpp
 nsapi_shib_la_CXXFLAGS = $(NSAPI_INCLUDE)
-nsapi_shib_la_LDFLAGS = $(LITE_LIBS) -module -avoid-version
-nsapi_shib_la_LIBADD = \
+nsapi_shib_la_LDFLAGS = -module -avoid-version
+nsapi_shib_la_LIBADD = $(LITE_LIBS) \
   $(top_builddir)/shibsp/libshibsp-lite.la
 
 install-exec-hook:
diff --git a/odbc-store/Makefile.am b/odbc-store/Makefile.am
index 774f423..2d01685 100644
--- a/odbc-store/Makefile.am
+++ b/odbc-store/Makefile.am
@@ -6,13 +6,12 @@ plugin_LTLIBRARIES = odbc-store.la
 AM_CFLAGS = $(ODBC_CFLAGS)
 AM_CXXFLAGS = $(ODBC_CFLAGS)
 
-odbc_store_la_LIBADD = \
-	$(ODBC_LIBS)
+odbc_store_la_LIBADD = $(XMLSEC_LIBS) $(ODBC_LIBS)
 
 odbc_store_la_SOURCES = \
 	odbc-store.cpp
 
-odbc_store_la_LDFLAGS = -module -avoid-version $(XMLSEC_LIBS)
+odbc_store_la_LDFLAGS = -module -avoid-version
 
 install-exec-hook:
 	for la in $(plugin_LTLIBRARIES) ; do rm -f $(DESTDIR)$(plugindir)/$$la ; done
diff --git a/shibd/Makefile.am b/shibd/Makefile.am
index 909f343..5fe39ec 100644
--- a/shibd/Makefile.am
+++ b/shibd/Makefile.am
@@ -6,9 +6,7 @@ sbin_PROGRAMS = shibd
 
 shibd_SOURCES = shibd.cpp
 
-shibd_LDADD = \
+shibd_LIBADD = $(XMLSEC_LIBS) \
   $(top_builddir)/shibsp/libshibsp.la
 
-shibd_LDFLAGS = $(XMLSEC_LIBS)
-
 EXTRA_DIST = shibd.vcxproj shibd_win32.cpp resource.h shibd.rc
diff --git a/shibsp/Makefile.am b/shibsp/Makefile.am
index 208a7f7..5a9b4e4 100644
--- a/shibsp/Makefile.am
+++ b/shibsp/Makefile.am
@@ -215,8 +215,10 @@ libshibsp_la_SOURCES = \
 
 # this is different from the project version
 # http://sources.redhat.com/autobook/autobook/autobook_91.html
-libshibsp_la_LDFLAGS = "$(AM_LDFLAGS) $(XMLSEC_LIBS) -version-info 5:0:0"
-libshibsp_lite_la_LDFLAGS = "$(AM_LDFLAGS) $(LITE_LIBS) -version-info 5:0:0"
+libshibsp_la_LDFLAGS = "-version-info 5:0:0"
+libshibsp_la_LIBADD = "$(XMLSEC_LIBS)"
+libshibsp_lite_la_LDFLAGS = "-version-info 5:0:0"
+libshibsp_lite_la_LIBADD = "$(LITE_LIBS)"
 libshibsp_lite_la_CPPFLAGS = "-DSHIBSP_LITE"
 
 pkgsysconfdir = $(sysconfdir)/@PACKAGE_NAME@
diff --git a/util/Makefile.am b/util/Makefile.am
index e2baaa0..fa95eef 100644
--- a/util/Makefile.am
+++ b/util/Makefile.am
@@ -4,16 +4,12 @@ bin_PROGRAMS = mdquery resolvertest
 
 resolvertest_SOURCES = resolvertest.cpp
 
-resolvertest_LDADD = \
+resolvertest_LIBADD = $(XMLSEC_LIBS) \
 	$(top_builddir)/shibsp/libshibsp.la
 
-resolvertest_LDFLAGS = $(XMLSEC_LIBS)
-
 mdquery_SOURCES = mdquery.cpp
 
-mdquery_LDADD = \
+mdquery_LIBADD = $(XMLSEC_LIBS) \
 	$(top_builddir)/shibsp/libshibsp.la
 
-mdquery_LDFLAGS = $(XMLSEC_LIBS)
-
 EXTRA_DIST = mdquery.vcxproj resolvertest.vcxproj