2006-09-06 Marcus Brinkmann <marcus@g10code.de>
authorMarcus Brinkmann <mb@g10code.com>
Wed, 6 Sep 2006 21:41:14 +0000 (21:41 +0000)
committerMarcus Brinkmann <mb@g10code.com>
Wed, 6 Sep 2006 21:41:14 +0000 (21:41 +0000)
* 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).

g10/ChangeLog
g10/Makefile.am

index 55c8a15..c6de096 100644 (file)
@@ -1,3 +1,9 @@
+2006-09-06  Marcus Brinkmann  <marcus@g10code.de>
+
+       * 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  <wk@g10code.com>
 
        * gpg.c (main): Enable new assuan API.
index 0ca2da3..a49925b 100644 (file)
@@ -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)