[Pkg-bitcoin-commits] [libunivalue] 58/76: build: move libunivalue.la to the root 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 3f248e0b1384aa6cccf892fb3244a4af36265ed2
Author: Cory Fields <cory-nospam- at coryfields.com>
Date:   Thu Oct 8 00:05:05 2015 -0400

    build: move libunivalue.la to the root dir
    
    This will fix the downstream Bitcoin circular dependency, and is arguably
    cleaner anyway.
---
 Makefile.am | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 2800f46..df9e662 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)
 

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