diff options
| author | Justus Winter <justus@g10code.com> | 2016-09-27 15:54:56 +0200 |
|---|---|---|
| committer | Justus Winter <justus@g10code.com> | 2016-09-27 15:54:56 +0200 |
| commit | 2b23a321ac0b07beeac1dfa8d71f223e66c49b71 (patch) | |
| tree | 0ebd5bedda7531179a58458bf9cbe0be48edb1fb /common/Makefile.am | |
| parent | agent, sm: Set CTX after start_agent. (diff) | |
| download | gnupg2-2b23a321ac0b07beeac1dfa8d71f223e66c49b71.tar.xz gnupg2-2b23a321ac0b07beeac1dfa8d71f223e66c49b71.zip | |
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@g10code.com>
Diffstat (limited to 'common/Makefile.am')
| -rw-r--r-- | common/Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/common/Makefile.am b/common/Makefile.am index 422fcf60a..9f151f250 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 |