diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-13 10:48:06 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-10-13 10:54:31 +0200 |
| commit | 97bee37d4c35c3ee53b54b04f5e665250773b20c (patch) | |
| tree | c18a133b0f83dc6c7e2b49741b82ef91fd774fae /src | |
| parent | cd57f344a591edb1c8b35736b2734b39eb202dc3 (diff) | |
| parent | 3b1279fdb269727f4fd964df0c238401467930ea (diff) | |
Merge pull request #6788
3b1279f build: match upstream build change (Cory Fields)
313e7f5 Squashed 'src/univalue/' changes from 87d9045..5839ac3 (MarcoFalke)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/univalue/.gitignore | 9 | ||||
| -rw-r--r-- | src/univalue/Makefile.am | 10 | ||||
| -rw-r--r-- | src/univalue/build-aux/m4/.empty | 0 | ||||
| -rw-r--r-- | src/univalue/build-aux/m4/.gitignore | 1 | ||||
| -rw-r--r-- | src/univalue/lib/.gitignore | 8 | ||||
| -rw-r--r-- | src/univalue/test/.gitignore | 6 |
7 files changed, 16 insertions, 20 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0654ff4227..605031eb43 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -31,7 +31,7 @@ LIBBITCOIN_UTIL=libbitcoin_util.a LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a LIBBITCOINQT=qt/libbitcoinqt.a LIBSECP256K1=secp256k1/libsecp256k1.la -LIBUNIVALUE=univalue/lib/libunivalue.la +LIBUNIVALUE=univalue/libunivalue.la $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) diff --git a/src/univalue/.gitignore b/src/univalue/.gitignore index ca9e842348..a7a2ca9197 100644 --- a/src/univalue/.gitignore +++ b/src/univalue/.gitignore @@ -19,4 +19,13 @@ test-driver libtool ltmain.sh +*.a +*.la +*.lo +*.logs *.o +*.pc +*.trs + +.dirstamp +.libs diff --git a/src/univalue/Makefile.am b/src/univalue/Makefile.am index 2800f466dc..df9e66229c 100644 --- a/src/univalue/Makefile.am +++ b/src/univalue/Makefile.am @@ -5,20 +5,20 @@ ACLOCAL_AMFLAGS = -I build-aux/m4 include_HEADERS = include/univalue.h noinst_HEADERS = lib/univalue_escapes.h -lib_LTLIBRARIES = lib/libunivalue.la +lib_LTLIBRARIES = libunivalue.la pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = pc/libunivalue.pc -lib_libunivalue_la_SOURCES = \ +libunivalue_la_SOURCES = \ lib/univalue.cpp \ lib/univalue_read.cpp \ lib/univalue_write.cpp -lib_libunivalue_la_LDFLAGS = \ +libunivalue_la_LDFLAGS = \ -version-info $(LIBUNIVALUE_CURRENT):$(LIBUNIVALUE_REVISION):$(LIBUNIVALUE_AGE) \ -no-undefined -lib_libunivalue_la_CXXFLAGS = -I$(top_srcdir)/include +libunivalue_la_CXXFLAGS = -I$(top_srcdir)/include TESTS = test/unitester @@ -38,7 +38,7 @@ noinst_PROGRAMS = $(TESTS) TEST_DATA_DIR=test test_unitester_SOURCES = test/unitester.cpp -test_unitester_LDADD = lib/libunivalue.la +test_unitester_LDADD = libunivalue.la test_unitester_CXXFLAGS = -I$(top_srcdir)/include -DJSON_TEST_SRC=\"$(srcdir)/$(TEST_DATA_DIR)\" test_unitester_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS) diff --git a/src/univalue/build-aux/m4/.empty b/src/univalue/build-aux/m4/.empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/src/univalue/build-aux/m4/.empty +++ /dev/null diff --git a/src/univalue/build-aux/m4/.gitignore b/src/univalue/build-aux/m4/.gitignore new file mode 100644 index 0000000000..f063686524 --- /dev/null +++ b/src/univalue/build-aux/m4/.gitignore @@ -0,0 +1 @@ +/*.m4 diff --git a/src/univalue/lib/.gitignore b/src/univalue/lib/.gitignore index ca8c16dcd4..ee7fc2851c 100644 --- a/src/univalue/lib/.gitignore +++ b/src/univalue/lib/.gitignore @@ -1,10 +1,2 @@ - -libunivalue-uninstalled.pc -libunivalue.pc -libunivalue.a gen - .libs -*.lo -*.la - diff --git a/src/univalue/test/.gitignore b/src/univalue/test/.gitignore index e4dea0df72..4afa094b10 100644 --- a/src/univalue/test/.gitignore +++ b/src/univalue/test/.gitignore @@ -1,7 +1 @@ - unitester - -*.log -*.trs - -.libs |