diff options
| author | chris.lu@gmail.com <chris.lu@gmail.com@282b0af5-e82d-9cf1-ede4-77906d7719d0> | 2012-01-18 22:59:33 +0000 |
|---|---|---|
| committer | chris.lu@gmail.com <chris.lu@gmail.com@282b0af5-e82d-9cf1-ede4-77906d7719d0> | 2012-01-18 22:59:33 +0000 |
| commit | 380953692b5faa97ccd3caa62b9f5ed6e528f672 (patch) | |
| tree | e0c311e64d8cb7a3bf42f5d59e683f53bf433fe0 /weed-fs/src/pkg | |
| parent | 50b1eff39025d09fb2a3017f11cb944c86282334 (diff) | |
| download | seaweedfs-380953692b5faa97ccd3caa62b9f5ed6e528f672.tar.xz seaweedfs-380953692b5faa97ccd3caa62b9f5ed6e528f672.zip | |
generating makefiles from a newer version of gb
git-svn-id: https://weed-fs.googlecode.com/svn/trunk@41 282b0af5-e82d-9cf1-ede4-77906d7719d0
Diffstat (limited to 'weed-fs/src/pkg')
| -rw-r--r-- | weed-fs/src/pkg/directory/Makefile | 5 | ||||
| -rw-r--r-- | weed-fs/src/pkg/storage/Makefile | 5 | ||||
| -rw-r--r-- | weed-fs/src/pkg/util/Makefile | 5 |
3 files changed, 9 insertions, 6 deletions
diff --git a/weed-fs/src/pkg/directory/Makefile b/weed-fs/src/pkg/directory/Makefile index 55cc4ce50..49fc1b597 100644 --- a/weed-fs/src/pkg/directory/Makefile +++ b/weed-fs/src/pkg/directory/Makefile @@ -14,13 +14,14 @@ GBROOT=../../.. # gb: compile/link against local install GCIMPORTS+= -I $(GBROOT)/_obj LDIMPORTS+= -L $(GBROOT)/_obj + # gb: compile/link against GOPATH entries GOPATHSEP=: ifeq ($(GOHOSTOS),windows) GOPATHSEP=; endif -GCIMPORTS=-I $(subst $(GOPATHSEP),/pkg/$(GOOS)_$(GOARCH) -I , $(GOPATH))/pkg/$(GOOS)_$(GOARCH) -LDIMPORTS=-L $(subst $(GOPATHSEP),/pkg/$(GOOS)_$(GOARCH) -L , $(GOPATH))/pkg/$(GOOS)_$(GOARCH) +GCIMPORTS+=-I $(subst $(GOPATHSEP),/pkg/$(GOOS)_$(GOARCH) -I , $(GOPATH))/pkg/$(GOOS)_$(GOARCH) +LDIMPORTS+=-L $(subst $(GOPATHSEP),/pkg/$(GOOS)_$(GOARCH) -L , $(GOPATH))/pkg/$(GOOS)_$(GOARCH) # gb: copy to local install $(GBROOT)/_obj/$(TARG).a: _obj/$(TARG).a diff --git a/weed-fs/src/pkg/storage/Makefile b/weed-fs/src/pkg/storage/Makefile index ab50c9e8a..eceed56ba 100644 --- a/weed-fs/src/pkg/storage/Makefile +++ b/weed-fs/src/pkg/storage/Makefile @@ -16,13 +16,14 @@ GBROOT=../../.. # gb: compile/link against local install GCIMPORTS+= -I $(GBROOT)/_obj LDIMPORTS+= -L $(GBROOT)/_obj + # gb: compile/link against GOPATH entries GOPATHSEP=: ifeq ($(GOHOSTOS),windows) GOPATHSEP=; endif -GCIMPORTS=-I $(subst $(GOPATHSEP),/pkg/$(GOOS)_$(GOARCH) -I , $(GOPATH))/pkg/$(GOOS)_$(GOARCH) -LDIMPORTS=-L $(subst $(GOPATHSEP),/pkg/$(GOOS)_$(GOARCH) -L , $(GOPATH))/pkg/$(GOOS)_$(GOARCH) +GCIMPORTS+=-I $(subst $(GOPATHSEP),/pkg/$(GOOS)_$(GOARCH) -I , $(GOPATH))/pkg/$(GOOS)_$(GOARCH) +LDIMPORTS+=-L $(subst $(GOPATHSEP),/pkg/$(GOOS)_$(GOARCH) -L , $(GOPATH))/pkg/$(GOOS)_$(GOARCH) # gb: copy to local install $(GBROOT)/_obj/$(TARG).a: _obj/$(TARG).a diff --git a/weed-fs/src/pkg/util/Makefile b/weed-fs/src/pkg/util/Makefile index bf3a57f05..458e05408 100644 --- a/weed-fs/src/pkg/util/Makefile +++ b/weed-fs/src/pkg/util/Makefile @@ -14,13 +14,14 @@ GBROOT=../../.. # gb: compile/link against local install GCIMPORTS+= -I $(GBROOT)/_obj LDIMPORTS+= -L $(GBROOT)/_obj + # gb: compile/link against GOPATH entries GOPATHSEP=: ifeq ($(GOHOSTOS),windows) GOPATHSEP=; endif -GCIMPORTS=-I $(subst $(GOPATHSEP),/pkg/$(GOOS)_$(GOARCH) -I , $(GOPATH))/pkg/$(GOOS)_$(GOARCH) -LDIMPORTS=-L $(subst $(GOPATHSEP),/pkg/$(GOOS)_$(GOARCH) -L , $(GOPATH))/pkg/$(GOOS)_$(GOARCH) +GCIMPORTS+=-I $(subst $(GOPATHSEP),/pkg/$(GOOS)_$(GOARCH) -I , $(GOPATH))/pkg/$(GOOS)_$(GOARCH) +LDIMPORTS+=-L $(subst $(GOPATHSEP),/pkg/$(GOOS)_$(GOARCH) -L , $(GOPATH))/pkg/$(GOOS)_$(GOARCH) # gb: copy to local install $(GBROOT)/_obj/$(TARG).a: _obj/$(TARG).a |