diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-06-05 14:22:54 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-06-05 16:05:57 -0400 |
| commit | 56c157d5e087e3976ae05cad2dc08a1fcd9a2400 (patch) | |
| tree | 345cdb69770d6944079ece4069f31f895e8f0bfc /src/Makefile.qt.include | |
| parent | 70c71c50ce552c0358679653c04d7cc72a40222c (diff) | |
| download | bitcoin-56c157d5e087e3976ae05cad2dc08a1fcd9a2400.tar.xz | |
build: avoid the use of top_ and abs_ dir paths
Using them has the side effect of confusing the dependency-tracking logic.
Diffstat (limited to 'src/Makefile.qt.include')
| -rw-r--r-- | src/Makefile.qt.include | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Makefile.qt.include b/src/Makefile.qt.include index a25699e392..f434118abb 100644 --- a/src/Makefile.qt.include +++ b/src/Makefile.qt.include @@ -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) 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) # 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) |