From 35b2586bc3359dbbbf8cda6e4c49091a4861947a Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 28 Jan 2009 03:39:56 -0400 Subject: Removed Boost submodule. --- .gitignore | 1 + .gitmodules | 3 --- lib/Makefile | 14 ++++++++------ lib/boost | 1 - 4 files changed, 9 insertions(+), 10 deletions(-) delete mode 160000 lib/boost diff --git a/.gitignore b/.gitignore index 10d577d4..521720c1 100644 --- a/.gitignore +++ b/.gitignore @@ -70,6 +70,7 @@ /ledger.info /ledger.so /libtool +/lib/boost* /ltmain.sh /make.deps /make.sh diff --git a/.gitmodules b/.gitmodules index d6c8ead2..1352a8bb 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule "lib/boost"] - path = lib/boost - url = git://repo.or.cz/boost.git [submodule "lib/gdtoa"] path = lib/gdtoa url = git://github.com/jwiegley/gdtoa.git diff --git a/lib/Makefile b/lib/Makefile index 09894134..ff4c0d08 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -9,17 +9,19 @@ STOW_ROOT = /usr/local/stow HERE = $(shell pwd) +BOOST_VER = 1_37_0 + # architecture=combined boost-release: - (cd boost && \ - bjam release -j3 --prefix=$(STOW_ROOT)/boost \ - --build-dir=$(HERE)/boost/build --toolset=darwin \ + (cd boost_$(BOOST_VER) && \ + bjam release -j3 --prefix=$(STOW_ROOT)/boost_$(BOOST_VER) \ + --build-dir=$(HERE)/boost_$(BOOST_VER)/build --toolset=darwin \ --build-type=complete install) boost-debug: - (cd boost && \ - bjam debug -j3 --prefix=$(STOW_ROOT)/boost \ - --build-dir=$(HERE)/boost/build --toolset=darwin \ + (cd boost_$(BOOST_VER) && \ + bjam debug -j3 --prefix=$(STOW_ROOT)/boost_$(BOOST_VER) \ + --build-dir=$(HERE)/boost_$(BOOST_VER)/build --toolset=darwin \ --build-type=complete \ define=_GLIBCXX_DEBUG=1 install) diff --git a/lib/boost b/lib/boost deleted file mode 160000 index 39d1e20c..00000000 --- a/lib/boost +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 39d1e20cb03d22465f8d8884f744d254dfbfa0ce -- cgit v1.2.3