[Pkg-gnupg-commit] [gnupg2] 53/292: common: Correctly handle modules relying on npth.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch master
in repository gnupg2.

commit 2b23a321ac0b07beeac1dfa8d71f223e66c49b71
Author: Justus Winter <justus at g10code.com>
Date:   Tue Sep 27 15:54:56 2016 +0200

    common: Correctly handle modules relying on npth.
    
    * common/Makefile.am (common_sources): Drop 'call-gpg.{c,h}'.
    (with_npth_sources): New variable.
    (libcommonpth_a_SOURCES): Use the new variable.
    
    Signed-off-by: Justus Winter <justus at g10code.com>
---
 common/Makefile.am | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/common/Makefile.am b/common/Makefile.am
index 422fcf6..9f151f2 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -88,7 +88,6 @@ common_sources = \
 	helpfile.c \
 	mkdir_p.c mkdir_p.h \
 	strlist.c strlist.h \
-	call-gpg.c call-gpg.h \
 	exectool.c exectool.h \
 	server-help.c server-help.h \
 	name-value.c name-value.h \
@@ -114,11 +113,14 @@ endif
 without_npth_sources = \
         get-passphrase.c get-passphrase.h
 
+# Sources only useful with NPTH.
+with_npth_sources = \
+        call-gpg.c call-gpg.h
 
 libcommon_a_SOURCES = $(common_sources) $(without_npth_sources)
 libcommon_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) -DWITHOUT_NPTH=1
 
-libcommonpth_a_SOURCES = $(common_sources)
+libcommonpth_a_SOURCES = $(common_sources) $(with_npth_sources)
 libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
 
 if !HAVE_W32CE_SYSTEM

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git