diff options
| author | John Wiegley <johnw@newartisans.com> | 2010-06-07 05:21:52 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2010-06-07 08:32:11 -0400 |
| commit | 6c8485e6ea9c8648dad10bbcde2a74c34e871ead (patch) | |
| tree | 7f0c16eb3ba20113292efa9a9c48ff2531f92ab4 /lib | |
| parent | 89f0cbc7e0aba2cf15b3d7f9b444e00509e85dd4 (diff) | |
| download | fork-ledger-6c8485e6ea9c8648dad10bbcde2a74c34e871ead.tar.gz fork-ledger-6c8485e6ea9c8648dad10bbcde2a74c34e871ead.tar.bz2 fork-ledger-6c8485e6ea9c8648dad10bbcde2a74c34e871ead.zip | |
Moved up to g++ 4.5
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile | 91 |
1 files changed, 52 insertions, 39 deletions
diff --git a/lib/Makefile b/lib/Makefile index 14605176..e9708d28 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -2,32 +2,38 @@ # This is only important if you intend to produce a Ledger binary for # installation. -STOW_ROOT = /usr/local/stow -PRODUCTS = $(HOME)/Products - -CC = gcc-mp-4.4 -CXX = g++-mp-4.4 -LD = gcc-mp-4.4 -CPPFLAGS = -D_GLIBCXX_DEBUG=1 -D_GLIBCXX_FULLY_DYNAMIC_STRING=1 -CFLAGS = $(CPPFLAGS) -g -LDFLAGS = -g - -BOOST_VERSION = 1_43_0 -BOOST_SOURCE = boost_$(BOOST_VERSION) -BOOST_TOOLSET = darwin -BOOST_DEFINES = define=_GLIBCXX_DEBUG=1 define=_GLIBCXX_FULLY_DYNAMIC_STRING=1 -#BOOST_FLAGS = --architecture=x86 --address_model=32_64 -BOOST_FLAGS = --toolset=$(BOOST_TOOLSET) \ - --build-type=complete --layout=versioned \ - $(BOOST_DEFINES) -ICU_FLAGS = -sHAVE_ICU=1 -sICU_PATH=$(STOW_ROOT)/icu - -all: boost-build cppunit-build icu-build boost-icu-build +STOW_ROOT = /usr/local/stow +PRODUCTS = $(HOME)/Products + +CC = gcc-mp-4.5 +CXX = g++-mp-4.5 +LD = gcc-mp-4.5 +CXX_VERSION = 45 +CPPFLAGS = -D_GLIBCXX_DEBUG=1 -D_GLIBCXX_FULLY_DYNAMIC_STRING=1 +CFLAGS = $(CPPFLAGS) -g +LDFLAGS = -g + +BOOST_VERSION = 1_43_0 +BOOST_SOURCE = boost_$(BOOST_VERSION) +BOOST_TOOLSET = darwin +BOOST_DEFINES = define=_GLIBCXX_DEBUG=1 define=_GLIBCXX_FULLY_DYNAMIC_STRING=1 +#BOOST_FLAGS = --architecture=x86 --address_model=32_64 +BOOST_FLAGS = --toolset=$(BOOST_TOOLSET) \ + --build-type=complete --layout=versioned \ + $(BOOST_DEFINES) +BOOST_DIR = boost_$(BOOST_VERSION)-gcc$(CXX_VERSION) +BOOST_STOW = $(STOW_ROOT)/$(BOOST_DIR) +BOOST_BUILD = $(PRODUCTS)/$(BOOST_DIR) +ICU_FLAGS = -sHAVE_ICU=1 -sICU_PATH=$(STOW_ROOT)/icu +BOOST_ICU_DIR = boost_$(BOOST_VERSION)-icu-gcc$(CXX_VERSION) +BOOST_ICU_STOW = $(STOW_ROOT)/$(BOOST_ICU_DIR) +BOOST_ICU_BUILD = $(PRODUCTS)/$(BOOST_ICU_DIR) + +all: boost-build cppunit-build #icu-build boost-icu-build boost-build: (cd $(BOOST_SOURCE) && \ - bjam debug --prefix=$(STOW_ROOT)/boost_$(BOOST_VERSION) \ - --build-dir=$(PRODUCTS)/boost_$(BOOST_VERSION) \ + bjam debug --prefix=$(BOOST_STOW) --build-dir=$(BOOST_BUILD) \ $(BOOST_FLAGS) install) cppunit-build: @@ -37,23 +43,30 @@ cppunit-build: CFLAGS="$(CFLAGS)" \ LDFLAGS="$(LDFLAGS)" \ CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \ - --prefix=$(STOW_ROOT)/cppunit \ + --prefix=$(STOW_ROOT)/cppunit-gcc$(CXX_VERSION) \ --disable-doxygen --disable-dot && \ make install) -icu-build: - -(cd icu/source; make distclean) - (cd icu/source; sh autogen.sh; \ - ./configure CPPFLAGS="$(CPPFLAGS)" \ - CFLAGS="$(CFLAGS)" \ - LDFLAGS="$(LDFLAGS)" \ - CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \ - --enable-static --enable-debug \ - --prefix=$(STOW_ROOT)/icu && \ - make install) +#icu-build: +# -(cd icu/source; make distclean) +# (cd icu/source; sh autogen.sh; \ +# ./configure CPPFLAGS="$(CPPFLAGS)" \ +# CFLAGS="$(CFLAGS)" \ +# LDFLAGS="$(LDFLAGS)" \ +# CC="$(CC)" CXX="$(CXX)" LD="$(LD)" \ +# --enable-static --enable-debug \ +# --prefix=$(STOW_ROOT)/icu-gcc$(CXX_VERSION) && \ +# make install) +# +#boost-icu-build: +# (cd $(BOOST_SOURCE) && \ +# bjam debug --prefix=$(BOOST_ICU_STOW) --build-dir=$(BOOST_ICU_BUILD) \ +# $(BOOST_FLAGS) $(ICU_FLAGS) install) -boost-icu-build: - (cd $(BOOST_SOURCE) && \ - bjam debug --prefix=$(STOW_ROOT)/boost_$(BOOST_VERSION)-icu \ - --build-dir=$(PRODUCTS)/boost_$(BOOST_VERSION)-icu \ - $(BOOST_FLAGS) $(ICU_FLAGS) install) +clean: + -rm -fr $(BOOST_STOW) $(BOOST_BUILD) + -rm -fr $(BOOST_ICU_STOW) $(BOOST_ICU_BUILD) + -rm -fr $(STOW_ROOT)/cppunit-gcc$(CXX_VERSION) + -rm -fr $(STOW_ROOT)/icu-gcc$(CXX_VERSION) + -(cd cppunit; make distclean) + -(cd icu/source; make distclean) |