kvazar/kevacoin
1
0
Fork 0
mirror of https://github.com/kvazar-network/kevacoin.git synced 2025-01-17 18:40:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6788

Browse Source 
3b1279f build: match upstream build change (Cory Fields)
313e7f5 Squashed 'src/univalue/' changes from 87d9045..5839ac3 (MarcoFalke)
This commit is contained in:
Wladimir J. van der Laan 2015-10-13 10:48:06 +02:00
commit 97bee37d4c
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
7 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Makefile.am
View File

@ -31,7 +31,7 @@ LIBBITCOIN_UTIL=libbitcoin_util.a
LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a
LIBBITCOINQT=qt/libbitcoinqt.a LIBBITCOINQT=qt/libbitcoinqt.a
LIBSECP256K1=secp256k1/libsecp256k1.la LIBSECP256K1=secp256k1/libsecp256k1.la
LIBUNIVALUE=univalue/lib/libunivalue.la LIBUNIVALUE=univalue/libunivalue.la
$(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*)
$(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F)

9
src/univalue/.gitignore vendored
View File

@ -19,4 +19,13 @@ test-driver
libtool libtool
ltmain.sh ltmain.sh
*.a
*.la
*.lo
*.logs
*.o *.o
*.pc
*.trs
.dirstamp
.libs

10
src/univalue/Makefile.am
View File

@ -5,20 +5,20 @@ ACLOCAL_AMFLAGS = -I build-aux/m4
include_HEADERS = include/univalue.h include_HEADERS = include/univalue.h
noinst_HEADERS = lib/univalue_escapes.h noinst_HEADERS = lib/univalue_escapes.h
lib_LTLIBRARIES = lib/libunivalue.la lib_LTLIBRARIES = libunivalue.la
pkgconfigdir = $(libdir)/pkgconfig pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = pc/libunivalue.pc pkgconfig_DATA = pc/libunivalue.pc
lib_libunivalue_la_SOURCES = \ libunivalue_la_SOURCES = \
lib/univalue.cpp \ lib/univalue.cpp \
lib/univalue_read.cpp \ lib/univalue_read.cpp \
lib/univalue_write.cpp lib/univalue_write.cpp
lib_libunivalue_la_LDFLAGS = \ libunivalue_la_LDFLAGS = \
-version-info $(LIBUNIVALUE_CURRENT):$(LIBUNIVALUE_REVISION):$(LIBUNIVALUE_AGE) \ -version-info $(LIBUNIVALUE_CURRENT):$(LIBUNIVALUE_REVISION):$(LIBUNIVALUE_AGE) \
-no-undefined -no-undefined
lib_libunivalue_la_CXXFLAGS = -I$(top_srcdir)/include libunivalue_la_CXXFLAGS = -I$(top_srcdir)/include
TESTS = test/unitester TESTS = test/unitester
@ -38,7 +38,7 @@ noinst_PROGRAMS = $(TESTS)
TEST_DATA_DIR=test TEST_DATA_DIR=test
test_unitester_SOURCES = test/unitester.cpp 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_CXXFLAGS = -I$(top_srcdir)/include -DJSON_TEST_SRC=\"$(srcdir)/$(TEST_DATA_DIR)\"
test_unitester_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS) test_unitester_LDFLAGS = -static $(LIBTOOL_APP_LDFLAGS)

0
src/univalue/build-aux/m4/.empty
View File

1
src/univalue/build-aux/m4/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
/*.m4

8
src/univalue/lib/.gitignore vendored
View File

@ -1,10 +1,2 @@
libunivalue-uninstalled.pc
libunivalue.pc
libunivalue.a
gen gen
.libs .libs
*.lo
*.la

6
src/univalue/test/.gitignore vendored
View File

@ -1,7 +1 @@
unitester unitester
*.log
*.trs
.libs