[Pkg-bitcoin-commits] [libunivalue] 50/76: build: move shipped headers to include dir

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository libunivalue.

commit 64bbc3ba5ccaf3827a761d0d6b7ff3be3aca7e60
Author: Cory Fields <cory-nospam- at coryfields.com>
Date:   Fri Sep 25 15:45:25 2015 -0400

    build: move shipped headers to include dir
---
 Makefile.am                 | 6 ++++--
 {lib => include}/univalue.h | 0
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 8419ef6..6d6909b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,7 @@
 ACLOCAL_AMFLAGS = -I build-aux/m4
 
-include_HEADERS = lib/univalue.h lib/univalue_escapes.h
+include_HEADERS = include/univalue.h
+noinst_HEADERS = lib/univalue_escapes.h
 
 lib_LTLIBRARIES = lib/libunivalue.la
 
@@ -12,6 +13,7 @@ lib_libunivalue_la_SOURCES = \
 lib_libunivalue_la_LDFLAGS = \
 	-version-info $(LIBUNIVALUE_CURRENT):$(LIBUNIVALUE_REVISION):$(LIBUNIVALUE_AGE) \
 	-no-undefined
+lib_libunivalue_la_CXXFLAGS = -I$(top_srcdir)/include
 
 TESTS = test/unitester
 
@@ -23,7 +25,7 @@ TEST_DATA_DIR=test
 
 test_unitester_SOURCES = test/unitester.cpp
 test_unitester_LDADD = lib/libunivalue.la
-test_unitester_CXXFLAGS = -I$(top_srcdir)/lib -DJSON_TEST_SRC=\"$(srcdir)/$(TEST_DATA_DIR)\"
+test_unitester_CXXFLAGS = -I$(top_srcdir)/include -DJSON_TEST_SRC=\"$(srcdir)/$(TEST_DATA_DIR)\"
 
 TEST_FILES = \
 	$(TEST_DATA_DIR)/fail10.json \
diff --git a/lib/univalue.h b/include/univalue.h
similarity index 100%
rename from lib/univalue.h
rename to include/univalue.h

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-bitcoin/libunivalue.git