Squashed 'src/univalue/' changes from 87d9045..5839ac3

5839ac3 Merge pull request #13 from theuni/move-lib
3f248e0 build: move libunivalue.la to the root dir
a68aed5 Merge pull request #12 from jmcorgan/add-ignores
81cafe3 Update and consolidate git ignores

git-subtree-dir: src/univalue
git-subtree-split: 5839ac3311792f80b9cd5070440c2256e0e69e13
This commit is contained in:
MarcoFalke 2015-10-09 11:36:59 +02:00
parent 2f9f082b5e
commit 313e7f5c89
6 changed files with 15 additions and 19 deletions

9
.gitignore vendored
View file

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

View file

@ -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)

View file

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

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

8
lib/.gitignore vendored
View file

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

6
test/.gitignore vendored
View file

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