[svn] GnuPG - r4241 - trunk/agent

[svn author marcus]

Author: marcus
Date: 2006-09-06 22:57:57 +0200 (Wed, 06 Sep 2006)
New Revision: 4241

Modified:
   trunk/agent/ChangeLog
   trunk/agent/Makefile.am
Log:
2006-09-06  Marcus Brinkmann  <marcus at g10code.de>

	* Makefile.am (AM_CFLAGS): Add $(GPG_ERR_CFLAGS).
	(gpg_agent_LDADD): Replace -lgpg-error with $(GPG_ERROR_LIBS).


Modified: trunk/agent/ChangeLog
===================================================================
--- trunk/agent/ChangeLog	2006-09-06 16:35:52 UTC (rev 4240)
+++ trunk/agent/ChangeLog	2006-09-06 20:57:57 UTC (rev 4241)
@@ -1,3 +1,8 @@
+2006-09-06  Marcus Brinkmann  <marcus at g10code.de>
+
+	* Makefile.am (AM_CFLAGS): Add $(GPG_ERR_CFLAGS).
+	(gpg_agent_LDADD): Replace -lgpg-error with $(GPG_ERROR_LIBS).
+
 2006-09-06  Werner Koch  <wk at g10code.com>
 
 	* query.c: Renamed to ..

Modified: trunk/agent/Makefile.am
===================================================================
--- trunk/agent/Makefile.am	2006-09-06 16:35:52 UTC (rev 4240)
+++ trunk/agent/Makefile.am	2006-09-06 20:57:57 UTC (rev 4241)
@@ -27,7 +27,8 @@
 
 include $(top_srcdir)/am/cmacros.am
 
-AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS)
+AM_CFLAGS = $(LIBGCRYPT_CFLAGS) $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) \
+	$(PTH_CFLAGS)
 
 gpg_agent_SOURCES = \
 	gpg-agent.c agent.h \
@@ -48,7 +49,7 @@
 
 gpg_agent_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a ../gl/libgnu.a \
                 $(LIBGCRYPT_LIBS) $(PTH_LIBS) $(LIBASSUAN_LIBS) \
-	         -lgpg-error @LIBINTL@ $(NETLIBS)
+	        $(GPG_ERROR_LIBS) @LIBINTL@ $(NETLIBS)
 
 gpg_protect_tool_SOURCES = \
 	protect-tool.c \