diff options
| author | Marcus Brinkmann <[email protected]> | 2006-09-06 21:41:14 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2006-09-06 21:41:14 +0000 |
| commit | f89c0be405628d8f73a96de2b0cb8f989a81226f (patch) | |
| tree | 1d7e1fc7f994430ae90dca96a41721443255f53d | |
| parent | 2006-09-06 Marcus Brinkmann <[email protected]> (diff) | |
| download | gnupg-f89c0be405628d8f73a96de2b0cb8f989a81226f.tar.gz gnupg-f89c0be405628d8f73a96de2b0cb8f989a81226f.zip | |
2006-09-06 Marcus Brinkmann <[email protected]>
* Makefile.am (gpg2_LDADD, gpgv2_LDADD): Replace -lassuan and
-lgpg-error with $(LIBASSUAN_LIBS) and $(GPG_ERROR_LIBS).
(AM_CFLAGS): Add $(LIBASSUAN_CFLAGS) and $(GPG_ERROR_CFLAGS).
| -rw-r--r-- | g10/ChangeLog | 6 | ||||
| -rw-r--r-- | g10/Makefile.am | 6 |
2 files changed, 9 insertions, 3 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 55c8a15d5..c6de096e2 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,9 @@ +2006-09-06 Marcus Brinkmann <[email protected]> + + * Makefile.am (gpg2_LDADD, gpgv2_LDADD): Replace -lassuan and + -lgpg-error with $(LIBASSUAN_LIBS) and $(GPG_ERROR_LIBS). + (AM_CFLAGS): Add $(LIBASSUAN_CFLAGS) and $(GPG_ERROR_CFLAGS). + 2006-09-06 Werner Koch <[email protected]> * gpg.c (main): Enable new assuan API. diff --git a/g10/Makefile.am b/g10/Makefile.am index 0ca2da36a..a49925b43 100644 --- a/g10/Makefile.am +++ b/g10/Makefile.am @@ -27,7 +27,7 @@ AM_CPPFLAGS = -I$(top_srcdir)/gl -I$(top_srcdir)/common \ include $(top_srcdir)/am/cmacros.am -AM_CFLAGS = $(LIBGCRYPT_CFLAGS) +AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) needed_libs = ../gl/libgnu.a ../common/libcommon.a ../jnlib/libjnlib.a @@ -110,8 +110,8 @@ gpgv2_SOURCES = gpgv.c \ LDADD = $(needed_libs) $(ZLIBS) $(DNSLIBS) $(LIBREADLINE) \ $(LIBINTL) $(CAPLIBS) $(W32LIBS) -gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) -lassuan -lgpg-error -gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) -lassuan -lgpg-error +gpg2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) +gpgv2_LDADD = $(LIBGCRYPT_LIBS) $(LDADD) $(LIBASSUAN_LIBS) $(GPG_ERROR_LIBS) $(PROGRAMS): $(needed_libs) |