From bf991bb7dfb08fdbe25fca0003e60dd5539f152f Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Sun, 1 Nov 2009 05:43:26 -0800 Subject: [PATCH] Make.pkg: add DEPS= support allow Makefiles using Make.pkg to specify a list of directories that should be installed before trying to build the package. this is a stopgap for small package trees maintained outside the standard tree. R=r http://go/go-review/1016012 --- src/Make.pkg | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Make.pkg b/src/Make.pkg index 24cd454372..50e1d8d72b 100644 --- a/src/Make.pkg +++ b/src/Make.pkg @@ -18,6 +18,7 @@ GOFILES+=$(patsubst %.go,%.cgo1.go,$(CGOFILES)) GOFILES+=$(patsubst %.go,%.cgo2.go,$(CGOFILES)) OFILES+=$(patsubst %.go,%.cgo3.$O,$(CGOFILES)) INSTALLFILES+=$(patsubst %.go,$(pkgdir)/$(dir)/$(elem)_%.so,$(CGOFILES)) +PREREQ+=$(patsubst %,%.make,$(DEPS)) coverage: gotest @@ -41,10 +42,10 @@ $(pkgdir)/$(TARG).a: package @test -d $(GOROOT)/pkg && mkdir -p $(pkgdir)/$(dir) cp _obj/$(TARG).a $@ -_go_.$O: $(GOFILES) +_go_.$O: $(GOFILES) $(PREREQ) $(GC) -o $@ $(GOFILES) -_gotest_.$O: $(GOFILES) $(GOTESTFILES) +_gotest_.$O: $(GOFILES) $(GOTESTFILES) $(PREREQ) $(GC) -o $@ $(GOFILES) $(GOTESTFILES) _obj/$(TARG).a: _go_.$O $(OFILES) @@ -63,6 +64,8 @@ importpath: dir: @echo $(dir) +%.make: + (cd $* && make) # To use cgo in a Go package, add a line #