Take into account nuances for Mac OS X. :-(

This commit is contained in:
Matt T. Proud 2012-12-01 13:30:23 +01:00
parent c936df3291
commit 4f0f8f9552
2 changed files with 7 additions and 3 deletions

View File

@ -21,7 +21,6 @@ test: build
build:
$(MAKE) -C model
go build ./...
go build .
clean:
rm -rf $(TEST_ARTIFACTS)
@ -40,3 +39,4 @@ documentation: search_index
godoc -http=:6060 -index -index_files='search_index'
.PHONY: build clean format test

View File

@ -25,8 +25,9 @@ export CXXFLAGS := $(CXXFLAGS) -I$(OVERLAY_ROOT)/include
export CPPFLAGS := $(CPPFLAGS) -I$(OVERLAY_ROOT)/include
export LDFLAGS := $(LDFLAGS) -L$(OVERLAY_ROOT)/lib
export CGO_CFLAGS := $(CFLAGS)
export CGO_LDFLAGS := $(LDFLAGS)
GO_GET := go get -v -x
GO_GET := go get -u -v -x
APT_GET_INSTALL := sudo apt-get install -y
WGET := wget -c
@ -105,7 +106,9 @@ leveldb-stamp: cc rsync leveldb-$(LEVELDB_VERSION).tar.gz overlay
tar xzvf leveldb-$(LEVELDB_VERSION).tar.gz
$(MAKE) -C leveldb-$(LEVELDB_VERSION)
rsync -av "leveldb-$(LEVELDB_VERSION)/include/" "$(OVERLAY_ROOT)/include/"
rsync -av "leveldb-$(LEVELDB_VERSION)/"*.so* "$(OVERLAY_ROOT)/lib/"
-rsync -av "leveldb-$(LEVELDB_VERSION)/"*.*so* "$(OVERLAY_ROOT)/lib/"
-rsync -av "leveldb-$(LEVELDB_VERSION)/"*.*dylib* "$(OVERLAY_ROOT)/lib/"
rsync -av "leveldb-$(LEVELDB_VERSION)/"*.a "$(OVERLAY_ROOT)/lib/"
touch $@
leveldb-$(LEVELDB_VERSION).tar.gz: wget
@ -153,3 +156,4 @@ clean:
.PHONY: all bison build-dependencies cc clean go goprotobuf gorest leveldb levigo mercurial overlay preparation protoc rsync source test wget