Browse Source

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
0.16
MarcoFalke 9 years ago
parent
commit
313e7f5c89
  1. 9
      .gitignore
  2. 10
      Makefile.am
  3. 0
      build-aux/m4/.empty
  4. 1
      build-aux/m4/.gitignore
  5. 8
      lib/.gitignore
  6. 6
      test/.gitignore

9
.gitignore vendored

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

10
Makefile.am

@ -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
build-aux/m4/.empty

1
build-aux/m4/.gitignore vendored

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

8
lib/.gitignore vendored

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

6
test/.gitignore vendored

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

Loading…
Cancel
Save