[xmlsec] fix linking order issue (based on patch from Roumen)



commit e19da97f33021cee80541228478bfb7f537ceb90
Author: Aleksey Sanin <aleksey aleksey com>
Date:   Tue Apr 20 16:43:24 2010 -0700

    fix linking order issue (based on patch from Roumen)

 apps/Makefile.am         |   11 +++++++----
 src/gnutls/Makefile.am   |    2 +-
 src/nss/Makefile.am      |    2 +-
 src/openssl/Makefile.am  |    2 +-
 src/skeleton/Makefile.am |    2 +-
 5 files changed, 11 insertions(+), 8 deletions(-)
---
diff --git a/apps/Makefile.am b/apps/Makefile.am
index eebbcca..278ddf4 100644
--- a/apps/Makefile.am
+++ b/apps/Makefile.am
@@ -2,12 +2,14 @@ NULL =
 
 bin_PROGRAMS = xmlsec1
 
+XMLSEC_LIBS = $(top_builddir)/src/libxmlsec1.la
+
+
 # check if we use dynamic loading for xmlsec-crypto or not
 if XMLSEC_NO_APPS_CRYPTO_DYNAMIC_LOADING
 
 CRYPTO_DEPS = \
 	$(top_builddir)/src/$(XMLSEC_CRYPTO)/lib$(XMLSEC_CRYPTO_LIB).la \
-	$(top_builddir)/src/libxmlsec1.la \
 	$(NULL)    
 
 CRYPTO_INCLUDES = \
@@ -18,14 +20,13 @@ CRYPTO_LD_FLAGS = \
 	$(NULL)
 
 CRYPTO_LD_ADD = \
-	$(CRYPTO_DEPS) \
 	$(XMLSEC_CRYPTO_LIBS) \
+	$(CRYPTO_DEPS) \
 	$(NULL)
 
 else
 
 CRYPTO_DEPS =  \
-	$(top_builddir)/src/libxmlsec1.la \
 	$(NULL)
 
 CRYPTO_INCLUDES = \
@@ -69,13 +70,15 @@ xmlsec1_LDFLAGS = \
 	$(NULL)
 
 xmlsec1_LDADD = \
-	$(CRYPTO_LD_ADD) \
 	$(LIBXSLT_LIBS) \
 	$(LIBXML_LIBS) \
+	$(CRYPTO_LD_ADD) \
+	$(XMLSEC_LIBS) \
 	$(XMLSEC_DL_LIBS) \
 	$(NULL)
 
 xmlsec1_DEPENDENCIES = \
 	$(CRYPTO_DEPS) \
+	$(XMLSEC_LIBS) \
 	$(NULL)
 
diff --git a/src/gnutls/Makefile.am b/src/gnutls/Makefile.am
index 7d639a3..9888d44 100644
--- a/src/gnutls/Makefile.am
+++ b/src/gnutls/Makefile.am
@@ -33,10 +33,10 @@ libxmlsec1_gnutls_la_SOURCES += ../strings.c
 endif
 
 libxmlsec1_gnutls_la_LIBADD = \
-	../libxmlsec1.la \
 	$(GNUTLS_LIBS) \
 	$(LIBXSLT_LIBS) \
 	$(LIBXML_LIBS) \
+	../libxmlsec1.la \
 	$(NULL)
 
 libxmlsec1_gnutls_la_DEPENDENCIES = \
diff --git a/src/nss/Makefile.am b/src/nss/Makefile.am
index 5209533..8cd8586 100644
--- a/src/nss/Makefile.am
+++ b/src/nss/Makefile.am
@@ -42,10 +42,10 @@ libxmlsec1_nss_la_SOURCES += ../strings.c
 endif
 
 libxmlsec1_nss_la_LIBADD = \
-	../libxmlsec1.la \
 	$(NSS_LIBS) \
 	$(LIBXSLT_LIBS) \
 	$(LIBXML_LIBS) \
+	../libxmlsec1.la \
 	$(NULL)
 
 libxmlsec1_nss_la_DEPENDENCIES = \
diff --git a/src/openssl/Makefile.am b/src/openssl/Makefile.am
index db2cd43..23c225a 100644
--- a/src/openssl/Makefile.am
+++ b/src/openssl/Makefile.am
@@ -41,10 +41,10 @@ libxmlsec1_openssl_la_SOURCES += ../strings.c
 endif
 
 libxmlsec1_openssl_la_LIBADD = \
-	../libxmlsec1.la \
 	$(OPENSSL_LIBS) \
 	$(LIBXSLT_LIBS) \
 	$(LIBXML_LIBS) \
+	../libxmlsec1.la \
 	$(NULL)
 
 libxmlsec1_openssl_la_DEPENDENCIES = \
diff --git a/src/skeleton/Makefile.am b/src/skeleton/Makefile.am
index 8e2e910..2f54f9d 100644
--- a/src/skeleton/Makefile.am
+++ b/src/skeleton/Makefile.am
@@ -30,10 +30,10 @@ libxmlsec1_skeleton_la_SOURCES += ../strings.c
 endif
 
 libxmlsec1_skeleton_la_LIBADD = \
-	../libxmlsec1.la \
 	$(SKELETON_LIBS) \
 	$(LIBXSLT_LIBS) \
 	$(LIBXML_LIBS) \
+	../libxmlsec1.la \
 	$(NULL)
 
 libxmlsec1_skeleton_la_DEPENDENCIES = \



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]