@@ -3,15 +3,25 @@ # installation. STOW_ROOT = /usr/local/stow +PRODUCTS = $(HOME)/Products + +EXTRA_DEFINES = -D_GLIBCXX_FULLY_DYNAMIC_STRING=1 BOOST_SOURCE = boost BOOST_VERSION = 1_40_0 +BOOST_TOOLSET = darwin +BOOST_DEFINES = define=_GLIBCXX_FULLY_DYNAMIC_STRING=1 +BOOST_FLAGS = --toolset=$(BOOST_TOOLSET) \ + --build-type=complete --layout=versioned \ + $(BOOST_DEFINES) +ICU_FLAGS = -sHAVE_ICU=1 -sICU_PATH=$(STOW_ROOT)/icu +ICU_DBG_FLAGS = -sHAVE_ICU=1 -sICU_PATH=$(STOW_ROOT)/icu-debug icu-release: -(cd icu/source; make distclean) (cd icu/source; sh autogen.sh; \ - ./configure CPPFLAGS="" \ - CFLAGS="$(ARCH_CFLAGS)" \ + ./configure CPPFLAGS="$(EXTRA_DEFINES)" \ + CFLAGS="$(EXTRA_DEFINES) $(ARCH_CFLAGS)" \ LDFLAGS="$(ARCH_LDFLAGS)" \ CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \ --enable-static \ @@ -21,8 +31,8 @@ icu-release: icu-debug: -(cd icu/source; make distclean) (cd icu/source; sh autogen.sh; \ - ./configure CPPFLAGS="-D_GLIBCXX_DEBUG=1" \ - CFLAGS="-g $(ARCH_CFLAGS)" \ + ./configure CPPFLAGS="-D_GLIBCXX_DEBUG=1 $(EXTRA_DEFINES)" \ + CFLAGS="-g $(EXTRA_DEFINES) $(ARCH_CFLAGS)" \ LDFLAGS="-g $(ARCH_LDFLAGS)" \ CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \ --enable-static --enable-debug \ @@ -31,28 +41,40 @@ icu-debug: icu-build: icu-release icu-debug +boost-icu-release: + (cd $(BOOST_SOURCE) && \ + bjam release --prefix=$(STOW_ROOT)/boost_$(BOOST_VERSION)-icu \ + --build-dir=$(PRODUCTS)/boost_$(BOOST_VERSION)-icu \ + $(BOOST_FLAGS) $(ICU_FLAGS) install) + +boost-icu-debug: + (cd $(BOOST_SOURCE) && \ + bjam debug --prefix=$(STOW_ROOT)/boost_$(BOOST_VERSION)-icu \ + --build-dir=$(PRODUCTS)/boost_$(BOOST_VERSION)-icu \ + $(BOOST_FLAGS) define=_GLIBCXX_DEBUG=1 \ + $(ICU_DBG_FLAGS) install) + +boost-icu-build: boost-icu-release boost-icu-debug + boost-release: (cd $(BOOST_SOURCE) && \ bjam release --prefix=$(STOW_ROOT)/boost_$(BOOST_VERSION) \ - --build-dir=$(HOME)/Products/boost_$(BOOST_VERSION) \ - --toolset=darwin --build-type=complete --layout=versioned \ - -sHAVE_ICU=1 -sICU_PATH=/usr/local/stow/icu install) + --build-dir=$(PRODUCTS)/boost_$(BOOST_VERSION) \ + $(BOOST_FLAGS) install) boost-debug: (cd $(BOOST_SOURCE) && \ bjam debug --prefix=$(STOW_ROOT)/boost_$(BOOST_VERSION) \ - --build-dir=$(HOME)/Products/boost_$(BOOST_VERSION) \ - --toolset=darwin --build-type=complete --layout=versioned \ - define=_GLIBCXX_DEBUG=1 \ - -sHAVE_ICU=1 -sICU_PATH=/usr/local/stow/icu-debug install) + --build-dir=$(PRODUCTS)/boost_$(BOOST_VERSION) \ + $(BOOST_FLAGS) define=_GLIBCXX_DEBUG=1 install) boost-build: boost-release boost-debug cppunit-release: -(cd cppunit; make distclean) (cd cppunit; sh autogen.sh; \ - ./configure CPPFLAGS="" \ - CFLAGS="$(ARCH_CFLAGS)" \ + ./configure CPPFLAGS="$(EXTRA_DEFINES)" \ + CFLAGS="$(EXTRA_DEFINES) $(ARCH_CFLAGS)" \ LDFLAGS="$(ARCH_LDFLAGS)" \ CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \ --prefix=$(STOW_ROOT)/cppunit && \ @@ -61,8 +83,8 @@ cppunit-release: cppunit-debug: -(cd cppunit; make distclean) (cd cppunit; sh autogen.sh; \ - ./configure CPPFLAGS="-D_GLIBCXX_DEBUG=1" \ - CFLAGS="-g $(ARCH_CFLAGS)" \ + ./configure CPPFLAGS="-D_GLIBCXX_DEBUG=1 $(EXTRA_DEFINES)" \ + CFLAGS="-g $(EXTRA_DEFINES) $(ARCH_CFLAGS)" \ LDFLAGS="-g $(ARCH_LDFLAGS)" \ CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \ --prefix=$(STOW_ROOT)/cppunit-debug && \ @@ -70,4 +92,4 @@ cppunit-debug: cppunit-build: cppunit-release cppunit-debug -all: boost-build cppunit-build +all: boost-build boost-icu-build cppunit-build lib/Makefile 9b1e4d1dbf97f20232d866ccb9533bac36909617 John Wiegley johnw@newartisans.com http://github.com/jwiegley/ledger/commit/188bf10b6c971caf9565b89361d8d82678307653 188bf10b6c971caf9565b89361d8d82678307653 2009-11-08T10:36:04-08:00 2009-11-08T10:36:04-08:00 Improved lib/Makefile 3571d4bac05fc4ae6f84632994689ff46910dddc John Wiegley johnw@newartisans.com