security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

common: Correctly handle modules relying on npth.

Browse Source 
* 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@g10code.com>
This commit is contained in:
Justus Winter 2016-09-27 15:54:56 +02:00
parent 4e4843e735
commit 2b23a321ac
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/Makefile.am
View File

@ -88,7 +88,6 @@ common_sources = \
helpfile.c \ helpfile.c \
mkdir_p.c mkdir_p.h \ mkdir_p.c mkdir_p.h \
strlist.c strlist.h \ strlist.c strlist.h \
call-gpg.c call-gpg.h \
exectool.c exectool.h \ exectool.c exectool.h \
server-help.c server-help.h \ server-help.c server-help.h \
name-value.c name-value.h \ name-value.c name-value.h \
@ -114,11 +113,14 @@ endif
without_npth_sources = \ without_npth_sources = \
get-passphrase.c get-passphrase.h 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_SOURCES = $(common_sources) $(without_npth_sources)
libcommon_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) -DWITHOUT_NPTH=1 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) libcommonpth_a_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(NPTH_CFLAGS)
if !HAVE_W32CE_SYSTEM if !HAVE_W32CE_SYSTEM