Browse Source

configure: Simplify common AM_CPPFLAGS and AM_LDFLAGS to a Makefile.common

pull/1/head
Luke Dashjr 9 years ago committed by Wladimir J. van der Laan
parent
commit
eb12a14da7
  1. 7
      src/Makefile.am
  2. 8
      src/Makefile.include
  3. 2
      src/leveldbwrapper.cpp
  4. 11
      src/qt/Makefile.am
  5. 11
      src/qt/test/Makefile.am
  6. 6
      src/test/Makefile.am

7
src/Makefile.am

@ -1,8 +1,7 @@ @@ -1,8 +1,7 @@
include Makefile.include
AM_CPPFLAGS = $(INCLUDES) -I$(top_builddir)/src/obj \
-I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src/leveldb/helpers \
-I$(builddir) $(BOOST_INCLUDES) $(BDB_CPPFLAGS)
AM_LDFLAGS = $(PTHREAD_CFLAGS)
AM_CPPFLAGS += -I$(top_srcdir)/src/leveldb/helpers/memenv \
-I$(builddir)
noinst_LIBRARIES = libbitcoin.a

8
src/Makefile.include

@ -1,5 +1,9 @@ @@ -1,5 +1,9 @@
# Helper for rules and subdir Makefiles to find parent targets.
# Flags and other non-target variables should not be set here.
AM_CPPFLAGS = $(INCLUDES) \
-I$(top_builddir)/src/obj \
-I$(top_srcdir)/src/leveldb/include \
$(BDB_CPPFLAGS) \
$(BOOST_INCLUDES)
AM_LDFLAGS = $(PTHREAD_CFLAGS)
LIBBITCOIN=$(top_builddir)/src/libbitcoin.a
LIBLEVELDB=$(top_builddir)/src/leveldb/libleveldb.a

2
src/leveldbwrapper.cpp

@ -10,7 +10,7 @@ @@ -10,7 +10,7 @@
#include <leveldb/cache.h>
#include <leveldb/env.h>
#include <leveldb/filter_policy.h>
#include <memenv/memenv.h>
#include <memenv.h>
void HandleError(const leveldb::Status &status) throw(leveldb_error) {
if (status.ok())

11
src/qt/Makefile.am

@ -1,11 +1,10 @@ @@ -1,11 +1,10 @@
include $(top_srcdir)/src/Makefile.include
AM_CPPFLAGS = $(INCLUDES) -I$(top_builddir)/src/obj \
-I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src \
-I$(top_srcdir)/src/leveldb/helpers -I$(top_builddir)/src/qt \
-I$(top_builddir)/src/qt/forms $(BOOST_INCLUDES) $(PROTOBUF_CFLAGS) \
$(QR_CFLAGS) $(BDB_CPPFLAGS)
AM_LDFLAGS = $(PTHREAD_CFLAGS)
AM_CPPFLAGS += -I$(top_srcdir)/src \
-I$(top_builddir)/src/qt \
-I$(top_builddir)/src/qt/forms \
$(PROTOBUF_CFLAGS) \
$(QR_CFLAGS)
bin_PROGRAMS = bitcoin-qt
noinst_LIBRARIES = libbitcoinqt.a
SUBDIRS = $(BUILD_TEST_QT)

11
src/qt/test/Makefile.am

@ -1,11 +1,10 @@ @@ -1,11 +1,10 @@
include $(top_srcdir)/src/Makefile.include
AM_CPPFLAGS = $(INCLUDES) -I$(top_builddir)/src/obj \
-I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src \
-I$(top_srcdir)/src/leveldb/helpers -I$(top_srcdir)/src/qt \
-I$(top_builddir)/src/qt $(BOOST_INCLUDES) $(PROTOBUF_CFLAGS) \
$(QR_CFLAGS) $(BDB_CPPFLAGS)
AM_LDFLAGS = $(PTHREAD_CFLAGS)
AM_CPPFLAGS += -I$(top_srcdir)/src \
-I$(top_srcdir)/src/qt \
-I$(top_builddir)/src/qt \
$(PROTOBUF_CFLAGS) \
$(QR_CFLAGS)
bin_PROGRAMS = test_bitcoin-qt
TESTS = test_bitcoin-qt

6
src/test/Makefile.am

@ -1,10 +1,6 @@ @@ -1,10 +1,6 @@
include $(top_srcdir)/src/Makefile.include
AM_CPPFLAGS = $(INCLUDES) -I$(top_builddir)/src/obj \
-I$(top_srcdir)/src/leveldb/include -I$(top_srcdir)/src/leveldb/helpers \
-I$(top_srcdir)/src $(BOOST_INCLUDES) $(BDB_CPPFLAGS)
AM_LDFLAGS = $(PTHREAD_CFLAGS)
AM_CPPFLAGS += -I$(top_srcdir)/src
bin_PROGRAMS = test_bitcoin

Loading…
Cancel
Save