[svn] GnuPG - r4243 - trunk/g10

[svn author marcus]

Author: marcus
Date: 2006-09-06 23:41:14 +0200 (Wed, 06 Sep 2006)
New Revision: 4243

Modified:
   trunk/g10/ChangeLog
   trunk/g10/Makefile.am
Log:
2006-09-06  Marcus Brinkmann  <marcus at 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).


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-09-06 21:09:36 UTC (rev 4242)
+++ trunk/g10/ChangeLog	2006-09-06 21:41:14 UTC (rev 4243)
@@ -1,3 +1,9 @@
+2006-09-06  Marcus Brinkmann  <marcus at 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 at g10code.com>
 
 	* gpg.c (main): Enable new assuan API.

Modified: trunk/g10/Makefile.am
===================================================================
--- trunk/g10/Makefile.am	2006-09-06 21:09:36 UTC (rev 4242)
+++ trunk/g10/Makefile.am	2006-09-06 21:41:14 UTC (rev 4243)
@@ -27,7 +27,7 @@
 
 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 @@
 
 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)