mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-17 14:07:03 +01:00
Last minute Makefile library reordering for the sake of non-GNU systems.
This commit is contained in:
parent
d0d7c3f053
commit
2f6b5cee0a
@ -45,8 +45,8 @@ gpg_agent_SOURCES = \
|
|||||||
call-scd.c \
|
call-scd.c \
|
||||||
learncard.c
|
learncard.c
|
||||||
|
|
||||||
common_libs = ../jnlib/libjnlib.a $(libcommon) ../gl/libgnu.a
|
common_libs = $(libcommon) ../jnlib/libjnlib.a ../gl/libgnu.a
|
||||||
commonpth_libs = ../jnlib/libjnlib.a $(libcommonpth) ../gl/libgnu.a
|
commonpth_libs = $(libcommonpth) ../jnlib/libjnlib.a ../gl/libgnu.a
|
||||||
pwquery_libs = ../common/libsimple-pwquery.a
|
pwquery_libs = ../common/libsimple-pwquery.a
|
||||||
|
|
||||||
#if HAVE_W32_SYSTEM
|
#if HAVE_W32_SYSTEM
|
||||||
|
@ -42,7 +42,7 @@ scdaemon_SOURCES = \
|
|||||||
app.c app-common.h app-help.c $(card_apps)
|
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) \
|
$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \
|
||||||
$(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \
|
$(LIBUSB_LIBS) $(GPG_ERROR_LIBS) \
|
||||||
$(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV)
|
$(LIBINTL) $(DL_LIBS) $(NETLIBS) $(LIBICONV)
|
||||||
|
@ -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>
|
2007-07-04 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
* certchain.c (check_cert_policy): Remove extra checks for
|
* certchain.c (check_cert_policy): Remove extra checks for
|
||||||
|
@ -52,8 +52,8 @@ gpgsm_SOURCES = \
|
|||||||
qualified.c
|
qualified.c
|
||||||
|
|
||||||
|
|
||||||
common_libs = ../jnlib/libjnlib.a ../kbx/libkeybox.a \
|
common_libs = $(libcommon) ../jnlib/libjnlib.a ../kbx/libkeybox.a \
|
||||||
$(libcommon) ../gl/libgnu.a
|
../gl/libgnu.a
|
||||||
|
|
||||||
gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
|
gpgsm_LDADD = $(common_libs) ../common/libgpgrl.a \
|
||||||
$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
|
$(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
|
||||||
|
@ -48,7 +48,7 @@ endif
|
|||||||
|
|
||||||
noinst_PROGRAMS = clean-sat mk-tdata make-dns-cert gpgsplit
|
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
|
pwquery_libs = ../common/libsimple-pwquery.a
|
||||||
|
|
||||||
gpgsplit_LDADD = $(common_libs) \
|
gpgsplit_LDADD = $(common_libs) \
|
||||||
|
Loading…
x
Reference in New Issue
Block a user