From 313e7f5c89d6e72e06efe9255089765b4c5815fe Mon Sep 17 00:00:00 2001
From: MarcoFalke <falke.marco@gmail.com>
Date: Fri, 9 Oct 2015 11:36:59 +0200
Subject: [PATCH 1/2] 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
---
 .gitignore              |  9 +++++++++
 Makefile.am             | 10 +++++-----
 build-aux/m4/.empty     |  0
 build-aux/m4/.gitignore |  1 +
 lib/.gitignore          |  8 --------
 test/.gitignore         |  6 ------
 6 files changed, 15 insertions(+), 19 deletions(-)
 delete mode 100644 build-aux/m4/.empty
 create mode 100644 build-aux/m4/.gitignore

diff --git a/.gitignore b/.gitignore
index ca9e84234..a7a2ca919 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 2800f466d..df9e66229 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 e69de29bb..000000000
diff --git a/build-aux/m4/.gitignore b/build-aux/m4/.gitignore
new file mode 100644
index 000000000..f06368652
--- /dev/null
+++ b/build-aux/m4/.gitignore
@@ -0,0 +1 @@
+/*.m4
diff --git a/lib/.gitignore b/lib/.gitignore
index ca8c16dcd..ee7fc2851 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 e4dea0df7..4afa094b1 100644
--- a/test/.gitignore
+++ b/test/.gitignore
@@ -1,7 +1 @@
-
 unitester
-
-*.log
-*.trs
-
-.libs

From 3b1279fdb269727f4fd964df0c238401467930ea Mon Sep 17 00:00:00 2001
From: Cory Fields <cory-nospam-@coryfields.com>
Date: Thu, 8 Oct 2015 00:09:44 -0400
Subject: [PATCH 2/2] build: match upstream build change

---
 src/Makefile.am | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Makefile.am b/src/Makefile.am
index 0654ff422..605031eb4 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)