[Pkg-bitcoin-commits] [libunivalue] 46/76: build: Don't use a SUBDIR for the lib build

[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 c3c41189893fdb12167efe59133d891ee593113f
Author: Cory Fields <cory-nospam- at coryfields.com>
Date:   Thu Sep 24 14:25:55 2015 -0400

    build: Don't use a SUBDIR for the lib build
---
 Makefile.am     | 19 ++++++++++++++++++-
 configure.ac    |  3 +--
 lib/Makefile.am | 18 ------------------
 3 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e49587a..b11ca18 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,21 @@
 ACLOCAL_AMFLAGS = -I build-aux/m4
 
-SUBDIRS = lib test
+include_HEADERS = lib/univalue.h lib/univalue_escapes.h
+
+lib_LTLIBRARIES = lib/libunivalue.la
+
+lib_libunivalue_la_SOURCES = \
+	lib/univalue.cpp \
+	lib/univalue_read.cpp \
+	lib/univalue_write.cpp
+
+lib_libunivalue_la_LDFLAGS = \
+	-version-info $(LIBUNIVALUE_CURRENT):$(LIBUNIVALUE_REVISION):$(LIBUNIVALUE_AGE) \
+	-no-undefined
+
+noinst_PROGRAMS = lib/gen
+
+lib_gen_SOURCES = lib/gen.cpp
+
+SUBDIRS = . test
 
diff --git a/configure.ac b/configure.ac
index 2a1b510..24af5ca 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,7 @@ AC_CONFIG_SRCDIR([lib/univalue.cpp])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([build-aux/m4])
 AC_CONFIG_HEADERS([univalue-config.h])
-AM_INIT_AUTOMAKE([foreign])
+AM_INIT_AUTOMAKE([subdir-objects foreign])
 
 LIBUNIVALUE_MAJOR_VERSION=libunivalue_major_version
 LIBUNIVALUE_MINOR_VERSION=libunivalue_minor_version
@@ -46,7 +46,6 @@ LT_INIT
 LT_LANG([C++])
 
 AC_CONFIG_FILES([
-    lib/Makefile
     test/Makefile
     Makefile
     lib/libunivalue.pc
diff --git a/lib/Makefile.am b/lib/Makefile.am
deleted file mode 100644
index aa4a134..0000000
--- a/lib/Makefile.am
+++ /dev/null
@@ -1,18 +0,0 @@
-
-include_HEADERS = univalue.h univalue_escapes.h
-
-lib_LTLIBRARIES = libunivalue.la
-
-libunivalue_la_SOURCES = \
-	univalue.cpp \
-	univalue_read.cpp \
-	univalue_write.cpp
-
-libunivalue_la_LDFLAGS = \
-	-version-info $(LIBUNIVALUE_CURRENT):$(LIBUNIVALUE_REVISION):$(LIBUNIVALUE_AGE) \
-	-no-undefined
-
-noinst_PROGRAMS = gen
-
-gen_SOURCES = gen.cpp
-

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