diff options
| -rw-r--r-- | agent/Makefile.am | 4 | ||||
| -rw-r--r-- | scd/Makefile.am | 2 | ||||
| -rw-r--r-- | sm/ChangeLog | 4 | ||||
| -rw-r--r-- | sm/Makefile.am | 4 | ||||
| -rw-r--r-- | tools/Makefile.am | 2 |
5 files changed, 10 insertions, 6 deletions
diff --git a/agent/Makefile.am b/agent/Makefile.am index 73fe935be..95ffafeec 100644 --- a/agent/Makefile.am +++ b/agent/Makefile.am @@ -45,8 +45,8 @@ gpg_agent_SOURCES = \ 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 diff --git a/scd/Makefile.am b/scd/Makefile.am index 2030c3ffb..abce5dc70 100644 --- a/scd/Makefile.am +++ b/scd/Makefile.am @@ -42,7 +42,7 @@ scdaemon_SOURCES = \ 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) diff --git a/sm/ChangeLog b/sm/ChangeLog index 8f24b1d40..d17afc615 100644 --- a/sm/ChangeLog +++ b/sm/ChangeLog @@ -1,3 +1,7 @@ +2007-07-05 Werner Koch <wk@g10code.com> + + * Makefile.am (common_libs): Changed order of libs. + 2007-07-04 Werner Koch <wk@g10code.com> * certchain.c (check_cert_policy): Remove extra checks for diff --git a/sm/Makefile.am b/sm/Makefile.am index 9427905a1..e551bbd0a 100644 --- a/sm/Makefile.am +++ b/sm/Makefile.am @@ -52,8 +52,8 @@ gpgsm_SOURCES = \ 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) \ diff --git a/tools/Makefile.am b/tools/Makefile.am index 4fda65d7b..1d9a865e3 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -48,7 +48,7 @@ endif 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) \ |