summaryrefslogtreecommitdiff
path: root/lib/Makefile
diff options
context:
space:
mode:
authorJohn Wiegley <johnw@newartisans.com>2012-09-26 12:25:26 -0500
committerJohn Wiegley <johnw@newartisans.com>2012-09-26 12:25:26 -0500
commit300cefd1a78ebeddb139a32fa7e1478a3f4225b4 (patch)
tree5060cdb9bb4ddab65c35b9e8b3dd10adc672daa9 /lib/Makefile
parent7c288b956d02f7a5157970876697b76fe66aaeae (diff)
downloadfork-ledger-300cefd1a78ebeddb139a32fa7e1478a3f4225b4.tar.gz
fork-ledger-300cefd1a78ebeddb139a32fa7e1478a3f4225b4.tar.bz2
fork-ledger-300cefd1a78ebeddb139a32fa7e1478a3f4225b4.zip
Changes to support using homebrew and ninja
Diffstat (limited to 'lib/Makefile')
-rw-r--r--lib/Makefile34
1 files changed, 3 insertions, 31 deletions
diff --git a/lib/Makefile b/lib/Makefile
index 92ec38ce..68755f18 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -2,7 +2,7 @@
# This is only important if you intend to produce a Ledger binary for
# installation.
-STOW_ROOT = /usr/local/stow
+STOW_ROOT = /usr/local/Cellar/boost
PRODUCTS = $(HOME)/Products
GCC_VERSION = 4.7
@@ -37,14 +37,10 @@ endif
BOOST_FLAGS = toolset=$(BOOST_TOOLSET) --layout=versioned \
link=shared threading=single $(BOOST_DEFINES)
BOOST_DIR = boost_$(BOOST_VERSION)-$(DIR_SUFFIX)
-BOOST_STOW = $(STOW_ROOT)/$(BOOST_DIR)
+BOOST_STOW = $(STOW_ROOT)/$(BOOST_VERSION)
BOOST_BUILD = $(PRODUCTS)/$(BOOST_DIR)
-ICU_FLAGS = -sHAVE_ICU=1 -sICU_PATH=$(STOW_ROOT)/icu-$(DIR_SUFFIX)
-BOOST_ICU_DIR = boost_$(BOOST_VERSION)-icu-$(DIR_SUFFIX)
-BOOST_ICU_STOW = $(STOW_ROOT)/$(BOOST_ICU_DIR)
-BOOST_ICU_BUILD = $(PRODUCTS)/$(BOOST_ICU_DIR)
-all: boost-build #icu-build boost-icu-build
+all: boost-build
prepare-boost:
perl -i -pe 's/local command = \[ common\.get-invocation-command darwin : g\+\+ : .*/local command = [ common.get-invocation-command darwin : g++ : $(CXX) ] ;/;' $(BOOST_SOURCE)/tools/build/v2/tools/darwin.jam
@@ -56,29 +52,5 @@ boost-build: prepare-boost
./b2 $(OPTJ) debug release --prefix=$(BOOST_STOW) \
--build-dir=$(BOOST_BUILD) $(BOOST_FLAGS) 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-$(DIR_SUFFIX) && \
- make install)
-
-boost-icu-build:
- (cd $(BOOST_SOURCE) && \
- sh bootstrap.sh && \
- ./bjam $(OPTJ) debug --prefix=$(BOOST_ICU_STOW) \
- --build-dir=$(BOOST_ICU_BUILD) \
- $(BOOST_FLAGS) $(ICU_FLAGS) install)
-
clean:
-rm -fr $(BOOST_STOW) $(BOOST_BUILD)
- -rm -fr $(BOOST_ICU_STOW) $(BOOST_ICU_BUILD)
- -rm -fr $(STOW_ROOT)/icu-$(DIR_SUFFIX)
- -(cd icu/source; make distclean)
-
-lib-clean:
- -(cd icu/source; make distclean)