minor changes to make make distcheck happy

8 files changed, 30 insertions, 9 deletions

diff --git a/agent/ChangeLog b/agent/ChangeLog
index f72784ecf..10f4d45fa 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,8 @@
+2003-07-31  Werner Koch  <wk@gnupg.org>
+
+	* Makefile.am (gpg_agent_LDADD): Added INTLLIBS.
+	(gpg_protect_tool_SOURCES): Added simple-pwquery.[ch]
+
 2003-07-27  Werner Koch  <wk@gnupg.org>
 
 	Adjusted for gcry_mpi_print and gcry_mpi_scan API change.
diff --git a/agent/Makefile.am b/agent/Makefile.am
index afd3e302d..400aa2fd2 100644
--- a/agent/Makefile.am
+++ b/agent/Makefile.am
@@ -46,15 +46,17 @@ gpg_agent_SOURCES = \
 
 
 gpg_agent_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a \
-                $(LIBGCRYPT_LIBS) $(PTH_LIBS) $(LIBASSUAN_LIBS) -lgpg-error
+                $(LIBGCRYPT_LIBS) $(PTH_LIBS) $(LIBASSUAN_LIBS) \
+	         -lgpg-error @INTLLIBS@
 
 gpg_protect_tool_SOURCES = \
 	protect-tool.c \
 	protect.c \
+	simple-pwquery.c simple-pwquery.h \
 	minip12.c minip12.h 
 
 gpg_protect_tool_LDADD = ../jnlib/libjnlib.a \
         ../common/libcommon.a ../common/libsimple-pwquery.a \
-	 $(LIBGCRYPT_LIBS) -lgpg-error
+	 $(LIBGCRYPT_LIBS) -lgpg-error @INTLLIBS@
 
 
diff --git a/agent/simple-pwquery.c b/agent/simple-pwquery.c
index afdc4e2a4..e870122cb 100644
--- a/agent/simple-pwquery.c
+++ b/agent/simple-pwquery.c
@@ -1,4 +1,4 @@
-/* simple-pwquery.c - A simple password query cleint for gpg-agent
+/* simple-pwquery.c - A simple password query client for gpg-agent
  *	Copyright (C) 2002 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
diff --git a/kbx/Makefile.am b/kbx/Makefile.am
index ada2963d9..4f0c40043 100644
--- a/kbx/Makefile.am
+++ b/kbx/Makefile.am
@@ -23,7 +23,8 @@ localedir = $(datadir)/locale
 INCLUDES = -I../intl -DLOCALEDIR=\"$(localedir)\"
 
 EXTRA_DIST = mkerrors
-AM_CPPFLAGS =   $(KSBA_CFLAGS) $(LIBGCRYPT_CFLAGS)
+AM_CPPFLAGS = -I$(top_srcdir)/common -I$(top_srcdir)/intl \
+	       $(LIBGCRYPT_CFLAGS) $(KSBA_CFLAGS)
 
 noinst_LIBRARIES = libkeybox.a
 bin_PROGRAMS = kbxutil
@@ -42,7 +43,10 @@ common_sources = \
 libkeybox_a_SOURCES = $(common_sources)
 
 kbxutil_SOURCES = kbxutil.c $(common_sources)
-kbxutil_LDADD   = ../jnlib/libjnlib.a  $(KSBA_LIBS) $(LIBGCRYPT_LIBS) -lgpg-error
+kbxutil_LDADD   = ../jnlib/libjnlib.a  $(KSBA_LIBS) $(LIBGCRYPT_LIBS) \
+                  -lgpg-error @INTLLIBS@ 
+
+
 
 
 
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 68aaa2984..ad4b0518c 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-31  Werner Koch  <wk@gnupg.org>
+
+	* Makefile.am (scdaemon_LDADD): Added INTLLIBS.
+
 2003-07-28  Werner Koch  <wk@gnupg.org>
 
 	* app-openpgp.c (do_setattr): Change implementation.  Allow all
diff --git a/scd/Makefile.am b/scd/Makefile.am
index 93bd8c73d..0771beb60 100644
--- a/scd/Makefile.am
+++ b/scd/Makefile.am
@@ -37,7 +37,8 @@ scdaemon_SOURCES = \
 	app-openpgp.c
 
 scdaemon_LDADD = ../jnlib/libjnlib.a ../common/libcommon.a \
-	  $(OPENSC_LIBS) $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) -lgpg-error -ldl
+	  $(OPENSC_LIBS) $(LIBGCRYPT_LIBS) $(KSBA_LIBS) $(LIBASSUAN_LIBS) \
+	 -lgpg-error @INTLLIBS@ -ldl
 
 sc_investigate_SOURCES = \
 	sc-investigate.c scdaemon.h \
@@ -49,7 +50,7 @@ sc_investigate_SOURCES = \
 
 sc_investigate_LDADD = \
 	../jnlib/libjnlib.a ../common/libcommon.a \
-	$(LIBGCRYPT_LIBS) -lgpg-error -ldl
+	$(LIBGCRYPT_LIBS) @INTLLIBS@ -lgpg-error -ldl
 
 
 sc_copykeys_SOURCES = \
@@ -63,7 +64,7 @@ sc_copykeys_SOURCES = \
 sc_copykeys_LDADD = \
 	../jnlib/libjnlib.a ../common/libcommon.a \
 	../common/libsimple-pwquery.a \
-	$(LIBGCRYPT_LIBS) -lgpg-error -ldl
+	$(LIBGCRYPT_LIBS) -lgpg-error @INTLLIBS@ -ldl
 
 
 
diff --git a/sm/ChangeLog b/sm/ChangeLog
index 22ed9a9c5..59a6b3271 100644
--- a/sm/ChangeLog
+++ b/sm/ChangeLog
@@ -1,3 +1,7 @@
+2003-07-31  Werner Koch  <wk@gnupg.org>
+
+	* Makefile.am (gpgsm_LDADD): Added INTLLIBS.
+
 2003-07-29  Werner Koch  <wk@gnupg.org>
 
 	* gpgsm.c (main): Add secmem features and set the random seed file.
diff --git a/sm/Makefile.am b/sm/Makefile.am
index 4c215c61d..6345573e5 100644
--- a/sm/Makefile.am
+++ b/sm/Makefile.am
@@ -51,4 +51,5 @@ gpgsm_SOURCES = \
 
 
 gpgsm_LDADD = ../jnlib/libjnlib.a ../kbx/libkeybox.a ../common/libcommon.a \
-               $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(KSBA_LIBS) -lgpg-error
\ No newline at end of file
+               $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(KSBA_LIBS) -lgpg-error \
+		@INTLLIBS@