[svn] GnuPG - r4533 - in trunk: agent scd sm tools

[svn author wk]

Author: wk
Date: 2007-07-05 22:11:11 +0200 (Thu, 05 Jul 2007)
New Revision: 4533

Modified:
   trunk/agent/Makefile.am
   trunk/scd/Makefile.am
   trunk/sm/ChangeLog
   trunk/sm/Makefile.am
   trunk/tools/Makefile.am
Log:
Last minute Makefile library reordering for the sake of non-GNU systems.


Modified: trunk/agent/Makefile.am
===================================================================
--- trunk/agent/Makefile.am	2007-07-05 18:59:50 UTC (rev 4532)
+++ trunk/agent/Makefile.am	2007-07-05 20:11:11 UTC (rev 4533)
@@ -45,8 +45,8 @@
 	call-scd.c \
 	learncard.c
 
-common_libs = ../jnlib/libjnlib.a $(libcommon) ../gl/libgnu.a
-commonpth_libs = ../jnlib/libjnlib.a $(libcommonpth) ../gl/libgnu.a
+common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a
+commonpth_libs = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a
 pwquery_libs = ../common/libsimple-pwquery.a
 
 #if HAVE_W32_SYSTEM

Modified: trunk/scd/Makefile.am
===================================================================
--- trunk/scd/Makefile.am	2007-07-05 18:59:50 UTC (rev 4532)
+++ trunk/scd/Makefile.am	2007-07-05 20:11:11 UTC (rev 4533)
@@ -42,7 +42,7 @@
 	app.c app-common.h app-help.c $(card_apps)
 
 
-scdaemon_LDADD = ../jnlib/libjnlib.a $(libcommonpth) ../gl/libgnu.a \
+scdaemon_LDADD = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a \
 	$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
 	$(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \
         $(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV)

Modified: trunk/sm/ChangeLog
===================================================================
--- trunk/sm/ChangeLog	2007-07-05 18:59:50 UTC (rev 4532)
+++ trunk/sm/ChangeLog	2007-07-05 20:11:11 UTC (rev 4533)
@@ -1,3 +1,7 @@
+2007-07-05  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (common_libs): Changed order of libs.
+
 2007-07-04  Werner Koch  <wk at g10code.com>
 
 	* certchain.c (check_cert_policy): Remove extra checks for

Modified: trunk/sm/Makefile.am
===================================================================
--- trunk/sm/Makefile.am	2007-07-05 18:59:50 UTC (rev 4532)
+++ trunk/sm/Makefile.am	2007-07-05 20:11:11 UTC (rev 4533)
@@ -52,8 +52,8 @@
 	qualified.c
 
 
-common_libs = ../jnlib/libjnlib.a ../kbx/libkeybox.a \
-              $(libcommon) ../gl/libgnu.a
+common_libs = $(libcommon) ../jnlib/libjnlib.a ../kbx/libkeybox.a \
+              ../gl/libgnu.a
 
 gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
               $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \

Modified: trunk/tools/Makefile.am
===================================================================
--- trunk/tools/Makefile.am	2007-07-05 18:59:50 UTC (rev 4532)
+++ trunk/tools/Makefile.am	2007-07-05 20:11:11 UTC (rev 4533)
@@ -48,7 +48,7 @@
 
 noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
 
-common_libs = ../jnlib/libjnlib.a $(libcommon) ../gl/libgnu.a
+common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a
 pwquery_libs = ../common/libsimple-pwquery.a
 
 gpgsplit_LDADD = $(common_libs) \