diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2013-09-09 02:02:28 +0000 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2013-11-11 09:57:28 +0100 |
| commit | eb12a14da777341e19035947f41c3e08470acd44 (patch) | |
| tree | 6ecbe6298f518eec14000177b257ce30e5a49209 /src/qt | |
| parent | fb4a31a26c5fbbedf6f67a24f4c6ad3dba70f7f5 (diff) | |
configure: Simplify common AM_CPPFLAGS and AM_LDFLAGS to a Makefile.common
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/Makefile.am | 11 | ||||
| -rw-r--r-- | src/qt/test/Makefile.am | 11 |
2 files changed, 10 insertions, 12 deletions
diff --git a/src/qt/Makefile.am b/src/qt/Makefile.am index 4ecd5629ea..3ede99dfa3 100644 --- a/src/qt/Makefile.am +++ b/src/qt/Makefile.am @@ -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) diff --git a/src/qt/test/Makefile.am b/src/qt/test/Makefile.am index f8fe97462b..7891c3e975 100644 --- a/src/qt/test/Makefile.am +++ b/src/qt/test/Makefile.am @@ -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 |