diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2015-10-09 11:36:59 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2015-10-09 11:36:59 +0200 |
| commit | 313e7f5c89d6e72e06efe9255089765b4c5815fe (patch) | |
| tree | 259c34c09fea315ca8ac9efd61111e6321c315cb | |
| parent | 2f9f082b5ef3c495c70598ef23383effef675f9a (diff) | |
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
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | build-aux/m4/.empty | 0 | ||||
| -rw-r--r-- | build-aux/m4/.gitignore | 1 | ||||
| -rw-r--r-- | lib/.gitignore | 8 | ||||
| -rw-r--r-- | test/.gitignore | 6 |
6 files changed, 15 insertions, 19 deletions
diff --git a/.gitignore b/.gitignore index ca9e842348..a7a2ca9197 100644 --- a/.gitignore +++ b/.gitignore @@ -19,4 +19,13 @@ test-driver libtool ltmain.sh +*.a +*.la +*.lo +*.logs *.o +*.pc +*.trs + +.dirstamp +.libs diff --git a/Makefile.am b/Makefile.am index 2800f466dc..df9e66229c 100644 --- a/Makefile.am +++ b/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/build-aux/m4/.empty b/build-aux/m4/.empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/build-aux/m4/.empty +++ /dev/null diff --git a/build-aux/m4/.gitignore b/build-aux/m4/.gitignore new file mode 100644 index 0000000000..f063686524 --- /dev/null +++ b/build-aux/m4/.gitignore @@ -0,0 +1 @@ +/*.m4 diff --git a/lib/.gitignore b/lib/.gitignore index ca8c16dcd4..ee7fc2851c 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -1,10 +1,2 @@ - -libunivalue-uninstalled.pc -libunivalue.pc -libunivalue.a gen - .libs -*.lo -*.la - diff --git a/test/.gitignore b/test/.gitignore index e4dea0df72..4afa094b10 100644 --- a/test/.gitignore +++ b/test/.gitignore @@ -1,7 +1 @@ - unitester - -*.log -*.trs - -.libs |