diff options
| author | Ben McGinnes <[email protected]> | 2018-03-24 22:44:51 +0000 |
|---|---|---|
| committer | Ben McGinnes <[email protected]> | 2018-03-24 22:44:51 +0000 |
| commit | d0bb4ec4ecdfae4dfd9dd84aef905afb490013d5 (patch) | |
| tree | e9d1a21501e4d09bd0442e9eee829046b25a922d /src/Makefile.am | |
| parent | doc: python bindings howto (diff) | |
| parent | core: Need to increase an array in the gpg engine. (diff) | |
| download | gpgme-d0bb4ec4ecdfae4dfd9dd84aef905afb490013d5.tar.gz gpgme-d0bb4ec4ecdfae4dfd9dd84aef905afb490013d5.zip | |
Merge branch 'master' of ssh+git://playfair.gnupg.org/git/gpgme
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 |