Browse Source

build: avoid the use of top_ and abs_ dir paths

Using them has the side effect of confusing the dependency-tracking logic.
pull/1/head
Cory Fields 9 years ago
parent
commit
56c157d5e0
  1. 14
      src/Makefile.am
  2. 10
      src/Makefile.qt.include
  3. 6
      src/Makefile.qttest.include
  4. 2
      src/Makefile.test.include
  5. 2
      src/m4/bitcoin_qt.m4

14
src/Makefile.am

@ -1,5 +1,5 @@ @@ -1,5 +1,5 @@
AM_CPPFLAGS = $(INCLUDES) \
-I$(top_builddir)/src/obj \
-I$(builddir)/obj \
$(BDB_CPPFLAGS) \
$(BOOST_CPPFLAGS) $(BOOST_INCLUDES)
AM_CPPFLAGS += $(LEVELDB_CPPFLAGS)
@ -8,10 +8,10 @@ AM_LDFLAGS = $(PTHREAD_CFLAGS) @@ -8,10 +8,10 @@ AM_LDFLAGS = $(PTHREAD_CFLAGS)
AM_CPPFLAGS += -I$(builddir)
if EMBEDDED_LEVELDB
LEVELDB_CPPFLAGS += -I$(top_srcdir)/src/leveldb/include
LEVELDB_CPPFLAGS += -I$(top_srcdir)/src/leveldb/helpers/memenv
LIBLEVELDB += $(top_builddir)/src/leveldb/libleveldb.a
LIBMEMENV += $(top_builddir)/src/leveldb/libmemenv.a
LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/include
LEVELDB_CPPFLAGS += -I$(srcdir)/leveldb/helpers/memenv
LIBLEVELDB += $(builddir)/leveldb/libleveldb.a
LIBMEMENV += $(builddir)/leveldb/libmemenv.a
# NOTE: This dependency is not strictly necessary, but without it make may try to build both in parallel, which breaks the LevelDB build system in a race
$(LIBLEVELDB): $(LIBMEMENV)
@ -101,7 +101,7 @@ JSON_H = \ @@ -101,7 +101,7 @@ JSON_H = \
json/json_spirit_writer_template.h
obj/build.h: FORCE
@$(MKDIR_P) $(abs_top_builddir)/src/obj
@$(MKDIR_P) $(builddir)/obj
@$(top_srcdir)/share/genbuild.sh $(abs_top_builddir)/src/obj/build.h \
$(abs_top_srcdir)
version.o: obj/build.h
@ -164,7 +164,7 @@ libbitcoin_cli_a_SOURCES = \ @@ -164,7 +164,7 @@ libbitcoin_cli_a_SOURCES = \
rpcclient.cpp \
$(BITCOIN_CORE_H)
nodist_libbitcoin_common_a_SOURCES = $(top_srcdir)/src/obj/build.h
nodist_libbitcoin_common_a_SOURCES = $(srcdir)/obj/build.h
#
# bitcoind binary #

10
src/Makefile.qt.include

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
AM_CPPFLAGS += -I$(top_srcdir)/src \
-I$(top_builddir)/src/qt \
-I$(top_builddir)/src/qt/forms \
AM_CPPFLAGS += -I$(srcdir) \
-I$(builddir)/qt \
-I$(builddir)/qt/forms \
$(PROTOBUF_CFLAGS) \
$(QR_CFLAGS)
bin_PROGRAMS += qt/bitcoin-qt
@ -320,7 +320,7 @@ RES_MOVIES = $(wildcard qt/res/movies/spinner-*.png) @@ -320,7 +320,7 @@ RES_MOVIES = $(wildcard qt/res/movies/spinner-*.png)
BITCOIN_RC = qt/res/bitcoin-qt-res.rc
qt_libbitcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
-I$(top_srcdir)/src/qt/forms $(QT_DBUS_INCLUDES)
-I$(srcdir)/qt/forms $(QT_DBUS_INCLUDES)
qt_libbitcoinqt_a_SOURCES = $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(QT_FORMS_UI) \
$(QT_QRC) $(QT_TS) $(PROTOBUF_PROTO) $(RES_ICONS) $(RES_IMAGES) $(RES_MOVIES)
@ -342,7 +342,7 @@ $(QT_MOC_CPP): $(PROTOBUF_H) @@ -342,7 +342,7 @@ $(QT_MOC_CPP): $(PROTOBUF_H)
# bitcoin-qt binary #
qt_bitcoin_qt_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
-I$(top_srcdir)/src/qt/forms
-I$(srcdir)/qt/forms
qt_bitcoin_qt_SOURCES = qt/bitcoin.cpp
if TARGET_DARWIN
qt_bitcoin_qt_SOURCES += $(BITCOIN_MM)

6
src/Makefile.qttest.include

@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
AM_CPPFLAGS += -I$(top_srcdir)/src \
-I$(top_srcdir)/src/qt \
-I$(top_builddir)/src/qt \
AM_CPPFLAGS += -I$(srcdir) \
-I$(srcdir)/qt \
-I$(builddir)/qt \
$(PROTOBUF_CFLAGS) \
$(QR_CFLAGS)
bin_PROGRAMS += qt/test/test_bitcoin-qt

2
src/Makefile.test.include

@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
AM_CPPFLAGS += -I$(top_builddir)/src/test/
AM_CPPFLAGS += -I$(builddir)/test/
TESTS += test/test_bitcoin
bin_PROGRAMS += test/test_bitcoin

2
src/m4/bitcoin_qt.m4

@ -100,7 +100,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[ @@ -100,7 +100,7 @@ AC_DEFUN([BITCOIN_QT_CONFIGURE],[
BITCOIN_QT_PATH_PROGS([LRELEASE], [lrelease-qt${bitcoin_qt_got_major_vers} lrelease${bitcoin_qt_got_major_vers} lrelease], $qt_bin_path)
BITCOIN_QT_PATH_PROGS([LUPDATE], [lupdate-qt${bitcoin_qt_got_major_vers} lupdate${bitcoin_qt_got_major_vers} lupdate],$qt_bin_path, yes)
MOC_DEFS='-DHAVE_CONFIG_H -I$(top_srcdir)/src'
MOC_DEFS='-DHAVE_CONFIG_H -I$(srcdir)'
case $host in
*darwin*)
BITCOIN_QT_CHECK([

Loading…
Cancel
Save