[svn] GnuPG - r5395 - in trunk: common dirmngr tools

[svn author wk]

Author: wk
Date: 2010-08-13 13:42:14 +0200 (Fri, 13 Aug 2010)
New Revision: 5395

Modified:
   trunk/common/ChangeLog
   trunk/common/Makefile.am
   trunk/dirmngr/ChangeLog
   trunk/dirmngr/Makefile.am
   trunk/tools/ChangeLog
   trunk/tools/Makefile.am
Log:
Minor Makefile fixes to let it build on all platforms


Modified: trunk/common/ChangeLog
===================================================================
--- trunk/common/ChangeLog	2010-08-13 10:02:12 UTC (rev 5394)
+++ trunk/common/ChangeLog	2010-08-13 11:42:14 UTC (rev 5395)
@@ -1,3 +1,8 @@
+2010-08-13  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (audit-events.h, status-codes.h): Fix srcdir problem
+	amd depend on Makefile.am instead of Makefile.
+
 2010-08-12  Werner Koch  <wk at g10code.com>
 
 	* sysutils.c (gnupg_remove) [W32CE]: Fix returned error.

Modified: trunk/dirmngr/ChangeLog
===================================================================
--- trunk/dirmngr/ChangeLog	2010-08-13 10:02:12 UTC (rev 5394)
+++ trunk/dirmngr/ChangeLog	2010-08-13 11:42:14 UTC (rev 5395)
@@ -1,5 +1,7 @@
 2010-08-13  Werner Koch  <wk at g10code.com>
 
+	* Makefile.am (dirmngr_SOURCES): Add w32-ldap-help.h.
+
 	* dirmngr_ldap.c (fetch_ldap): Call ldap_unbind.
 
 	* w32-ldap-help.h: New.

Modified: trunk/tools/ChangeLog
===================================================================
--- trunk/tools/ChangeLog	2010-08-13 10:02:12 UTC (rev 5394)
+++ trunk/tools/ChangeLog	2010-08-13 11:42:14 UTC (rev 5395)
@@ -1,3 +1,7 @@
+2010-08-13  Werner Koch  <wk at g10code.com>
+
+	* Makefile.am (gpgkey2ssh_LDADD): Add NETLIBS.
+
 2010-08-11  Werner Koch  <wk at g10code.com>
 
 	* gpgtar-create.c (gpgtar_create): Allow "-" for stdout in

Modified: trunk/common/Makefile.am
===================================================================
--- trunk/common/Makefile.am	2010-08-13 10:02:12 UTC (rev 5394)
+++ trunk/common/Makefile.am	2010-08-13 11:42:14 UTC (rev 5395)
@@ -139,16 +139,16 @@
 # is a distributed built source.  If we would not do that we may end
 # up with two files and then it is not clear which version of the
 # files will be picked up.
-audit-events.h: Makefile mkstrtable.awk exaudit.awk audit.h
+audit-events.h: Makefile.am mkstrtable.awk exaudit.awk audit.h
 	$(AWK) -f $(srcdir)/exaudit.awk $(srcdir)/audit.h \
 	  | $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=3 -v nogettext=1 \
-		   -v namespace=eventstr_  > $(srcdir)/$@
+		   -v namespace=eventstr_  > $(srcdir)/audit-events.h
 
 # Create the status-codes.h include file from status.h
-status-codes.h: Makefile mkstrtable.awk exstatus.awk status.h
+status-codes.h: Makefile.am mkstrtable.awk exstatus.awk status.h
 	$(AWK) -f $(srcdir)/exstatus.awk $(srcdir)/status.h \
 	  | $(AWK) -f $(srcdir)/mkstrtable.awk -v textidx=3 -v nogettext=1 \
-		   -v namespace=statusstr_  > $(srcdir)/$@
+		   -v namespace=statusstr_  > $(srcdir)/status-codes.h
 endif
 
 #

Modified: trunk/dirmngr/Makefile.am
===================================================================
--- trunk/dirmngr/Makefile.am	2010-08-13 10:02:12 UTC (rev 5394)
+++ trunk/dirmngr/Makefile.am	2010-08-13 11:42:14 UTC (rev 5395)
@@ -46,7 +46,7 @@
 
 dirmngr_SOURCES = dirmngr.c dirmngr.h server.c crlcache.c crlfetch.c	\
 	ldapserver.h ldapserver.c certcache.c certcache.h \
-	cdb.h cdblib.c ldap.c misc.c dirmngr-err.h \
+	cdb.h cdblib.c ldap.c misc.c dirmngr-err.h w32-ldap-help.h \
 	ocsp.c ocsp.h validate.c validate.h ldap-wrapper.h $(ldap_url)
 
 if USE_LDAPWRAPPER

Modified: trunk/tools/Makefile.am
===================================================================
--- trunk/tools/Makefile.am	2010-08-13 10:02:12 UTC (rev 5394)
+++ trunk/tools/Makefile.am	2010-08-13 11:42:14 UTC (rev 5395)
@@ -79,14 +79,15 @@
 
 gpgsplit_LDADD = $(common_libs) \
 	         $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
-		 $(ZLIBS) $(LIBINTL) $(LIBICONV)
+		 $(ZLIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV)
 
 gpgconf_SOURCES = gpgconf.c gpgconf.h gpgconf-comp.c no-libgcrypt.c
 
 # common sucks in gpg-error, will they, nil they (some compilers
 # do not eliminate the supposed-to-be-unused-inline-functions).
 gpgconf_LDADD = $(common_libs) $(opt_libassuan_libs) \
-                $(LIBINTL) $(GPG_ERROR_LIBS) $(LIBICONV) $(W32SOCKLIBS)
+                $(LIBINTL) $(GPG_ERROR_LIBS) $(NETLIBS) \
+	        $(LIBICONV) $(W32SOCKLIBS)
 
 gpgparsemail_SOURCES = gpgparsemail.c rfc822parse.c rfc822parse.h
 gpgparsemail_LDADD = 
@@ -94,7 +95,7 @@
 symcryptrun_SOURCES = symcryptrun.c
 symcryptrun_LDADD = $(LIBUTIL_LIBS) $(common_libs) $(pwquery_libs) \
                     $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) \
-                    $(LIBICONV) $(W32SOCKLIBS)
+                    $(LIBICONV) $(NETLIBS) $(W32SOCKLIBS)
 
 watchgnupg_SOURCES = watchgnupg.c 
 watchgnupg_LDADD = $(NETLIBS)
@@ -111,14 +112,15 @@
 # common via use of BUG() in an inline function, which
 # some compilers do not eliminate.
 gpgkey2ssh_LDADD = $(common_libs) \
-                   $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV)
+                   $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) $(LIBINTL) $(LIBICONV) \
+		   $(NETLIBS)
 endif
 
 if !DISABLE_REGEX
 gpg_check_pattern_SOURCES = gpg-check-pattern.c
 gpg_check_pattern_CFLAGS = $(LIBGCRYPT_CFLAGS) $(GPG_ERROR_CFLAGS)
 gpg_check_pattern_LDADD = $(common_libs) $(LIBGCRYPT_LIBS) $(GPG_ERROR_LIBS) \
-                          $(LIBINTL) $(LIBICONV) $(W32SOCKLIBS)
+                          $(LIBINTL) $(NETLIBS) $(LIBICONV) $(W32SOCKLIBS)
 endif
 
 gpgtar_SOURCES = \
@@ -129,7 +131,7 @@
 	no-libgcrypt.c
 gpgtar_CFLAGS = $(GPG_ERROR_CFLAGS) $(PTH_CFLAGS)
 #gpgtar_LDADD = $(commonpth_libs) $(PTH_LIBS) $(GPG_ERROR_LIBS)
-gpgtar_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(W32SOCKLIBS)
+gpgtar_LDADD = $(common_libs) $(GPG_ERROR_LIBS) $(NETLIBS) $(W32SOCKLIBS)
 
 
 # Make sure that all libs are build before we use them.  This is