diff options
| author | Werner Koch <[email protected]> | 2018-03-23 11:31:20 +0100 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2018-03-23 11:31:20 +0100 |
| commit | c7bb12da5297a7e188766d9759f700dd771faff8 (patch) | |
| tree | 28252df6c635c446d992e624e298aeb83b7d688a /src/Makefile.am | |
| parent | doc: python bindings howto (diff) | |
| parent | json: Finish op:encrypt. (diff) | |
| download | gpgme-c7bb12da5297a7e188766d9759f700dd771faff8.tar.gz gpgme-c7bb12da5297a7e188766d9759f700dd771faff8.zip | |
Merge branch 'json-tool'
Diffstat (limited to 'src/Makefile.am')
| -rw-r--r-- | src/Makefile.am | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index ce6f1d4e..c2d4a843 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,7 +26,7 @@ m4datadir = $(datadir)/aclocal m4data_DATA = gpgme.m4 nodist_include_HEADERS = gpgme.h -bin_PROGRAMS = gpgme-tool +bin_PROGRAMS = gpgme-tool gpgme-json if BUILD_W32_GLIB ltlib_gpgme_glib = libgpgme-glib.la @@ -95,13 +95,18 @@ if BUILD_W32_GLIB libgpgme_glib_la_SOURCES = $(main_sources) w32-glib-io.c endif -# We use a global CFLAGS setting for all library +# We use a global CFLAGS setting for all libraries # versions, because then every object file is only compiled once. AM_CFLAGS = @LIBASSUAN_CFLAGS@ @GLIB_CFLAGS@ gpgme_tool_SOURCES = gpgme-tool.c argparse.c argparse.h gpgme_tool_LDADD = libgpgme.la @LIBASSUAN_LIBS@ +gpgme_json_SOURCES = gpgme-json.c cJSON.c cJSON.h +gpgme_json_LDADD = -lm libgpgme.la $(GPG_ERROR_LIBS) +# We use -no-install temporary during development. +gpgme_json_LDFLAGS = -no-install + if HAVE_W32_SYSTEM # Windows provides us with an endless stream of Tough Love. To spawn |