diff options
| author | Cory Fields <cory-nospam-@coryfields.com> | 2014-05-28 13:38:41 -0400 |
|---|---|---|
| committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-06-05 16:05:17 -0400 |
| commit | 65e8ba4dbed519a3be6d497063c3441550c4b3d6 (patch) | |
| tree | f05cfb485fd966979014972cfbb249526466cdbe /src/Makefile.include | |
| parent | 5795aaca26d23d315f80ee0b45f1e1fa939e5cfd (diff) | |
| download | bitcoin-65e8ba4dbed519a3be6d497063c3441550c4b3d6.tar.xz | |
build: Switch to non-recursive make
Build logic moves from individual Makefile.am's to include files, which
the main src/Makefile.am includes. This avoids having to manage a gigantic
single Makefile.
TODO: Move the rules from the old Makefile.include to where they actually
belong and nuke the old file.
Diffstat (limited to 'src/Makefile.include')
| -rw-r--r-- | src/Makefile.include | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/Makefile.include b/src/Makefile.include index 2fc6cd7775..d3d3d6385a 100644 --- a/src/Makefile.include +++ b/src/Makefile.include @@ -12,23 +12,18 @@ AM_CPPFLAGS = $(INCLUDES) \ AM_CPPFLAGS += $(LEVELDB_CPPFLAGS) AM_LDFLAGS = $(PTHREAD_CFLAGS) -LIBBITCOIN_SERVER=$(top_builddir)/src/libbitcoin_server.a -LIBBITCOIN_WALLET=$(top_builddir)/src/libbitcoin_wallet.a -LIBBITCOIN_COMMON=$(top_builddir)/src/libbitcoin_common.a -LIBBITCOIN_CLI=$(top_builddir)/src/libbitcoin_cli.a -LIBBITCOINQT=$(top_builddir)/src/qt/libbitcoinqt.a - -$(LIBBITCOIN): - $(MAKE) -C $(top_builddir)/src $(@F) +LIBBITCOIN_SERVER=libbitcoin_server.a +LIBBITCOIN_WALLET=libbitcoin_wallet.a +LIBBITCOIN_COMMON=libbitcoin_common.a +LIBBITCOIN_CLI=libbitcoin_cli.a +LIBBITCOINQT=qt/libbitcoinqt.a if EMBEDDED_LEVELDB $(LIBLEVELDB) $(LIBMEMENV): $(MAKE) -C $(top_builddir)/src leveldb/$(@F) +$(LIBLEVELDB): $(LIBMEMENV) endif -$(LIBBITCOINQT): - $(MAKE) -C $(top_builddir)/src/qt $(@F) - .mm.o: $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ $(CPPFLAGS) $(AM_CXXFLAGS) $(QT_INCLUDES) $(CXXFLAGS) -c -o $@ $< |