Merge branch 'STABLE-BRANCH-2-2' into master
[gnupg.git] / tools / Makefile.am
index 94b53f2..0c828a7 100644 (file)
@@ -23,7 +23,7 @@ EXTRA_DIST = \
        ccidmon.c ChangeLog-2011 gpg-connect-agent-w32info.rc
 
 
-AM_CPPFLAGS = -I$(top_srcdir)/common
+AM_CPPFLAGS =
 include $(top_srcdir)/am/cmacros.am
 
 if HAVE_W32_SYSTEM
@@ -155,7 +155,7 @@ gpg_wks_server_SOURCES = \
 
 gpg_wks_server_CFLAGS = $(GPG_ERROR_CFLAGS) $(INCICONV)
 gpg_wks_server_LDADD = $(libcommon) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
-                      $(LIBICONV)
+                      $(LIBINTL) $(LIBICONV)
 
 gpg_wks_client_SOURCES = \
        gpg-wks-client.c \
@@ -171,7 +171,7 @@ gpg_wks_client_SOURCES = \
 gpg_wks_client_CFLAGS = $(LIBASSUAN_CFLAGS) $(GPG_ERROR_CFLAGS) $(INCICONV)
 gpg_wks_client_LDADD = $(libcommon) \
                       $(LIBASSUAN_LIBS) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
-                      $(LIBICONV)
+                      $(LIBINTL) $(LIBICONV)
 
 
 # Make sure that all libs are build before we use them.  This is