fix Makefile to use the go tool + amend install instructions

Sebastien Binet · Sebastien Binet · commit 67c872b9d214 · 2012-03-08T10:08:11.000+01:00
--HG--
rename : cmd/Makefile =&gt; cmd/go-python/Makefile
rename : cmd/main.go =&gt; cmd/go-python/main.go
diff --git a/Makefile b/Makefile
@@ -2,30 +2,14 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ${GOROOT}/src/Make.inc
+#include ${GOROOT}/src/Make.inc
 
 all: install
 
 DIRS=\
         pkg/python\
         tests\
-        cmd\
+        cmd/go-python\
 
-
-clean.dirs: $(addsuffix .clean, $(DIRS))
-install.dirs: $(addsuffix .install, $(DIRS))
-nuke.dirs: $(addsuffix .nuke, $(DIRS))
-test.dirs: $(addsuffix .test, $(TEST))
-bench.dirs: $(addsuffix .bench, $(BENCH))
-
-%.clean:
-	+cd $* && $(QUOTED_GOBIN)/gomake clean
-
-%.install:
-	+cd $* && $(QUOTED_GOBIN)/gomake install
-
-clean: clean.dirs
-
-install: install.dirs
-
-#-include ${GOROOT}/src/Make.deps
+install:
+	(cd pkg/python && make) && (cd cmd/go-python && make)
diff --git a/README b/README
@@ -19,7 +19,14 @@ the rational being that under such an executable, ``go`` based extensions for C-
 Install:
 --------
 
- $ goinstall bitbucket.org/binet/go-python/pkg/python
+With `Go 1` and the `go` tool, `cgo` packages can't pass anymore additional `CGO_CFLAGS` from external programs (except `pkg-config`) to the "fake" `#cgo` preprocessor directive.
+So one has to do instead:
+
+ $ mkdir -p $GOPATH/pkg/bitbucket.org/binet
+ $ cd $GOPATH/pkg/bitbucket.org/binet
+ $ hg clone http://bitbucket.org/binet/go-python
+ $ cd go-python && make
+
 
 
 Example:
diff --git a/cmd/go-python/Makefile b/cmd/go-python/Makefile
@@ -2,10 +2,15 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include ${GOROOT}/src/Make.inc
-
 TARG=go-python
 GOFILES=\
 	main.go
 
-include ${GOROOT}/src/Make.cmd
+build:
+	CGO_LDFLAGS="$(CGO_LDFLAGS)" CGO_CFLAGS="$(CGO_CFLAGS)" go build .
+
+install:
+	CGO_LDFLAGS="$(CGO_LDFLAGS)" CGO_CFLAGS="$(CGO_CFLAGS)" go install .
+
+all: install
+
diff --git a/cmd/go-python/main.go b/cmd/go-python/main.go
diff --git a/pkg/python/Makefile b/pkg/python/Makefile
@@ -2,36 +2,25 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-include $(GOROOT)/src/Make.inc
-
 TARG=bitbucket.org/binet/go-python/pkg/python
 
 PYTHON:=python2
 PYTHON_VERSION:=`$(PYTHON) -c "import distutils.sysconfig, sys; sys.stdout.write(''.join(distutils.sysconfig.get_config_vars('VERSION'))+'\n')"`
 PYTHON_CFLAGS :=`$(PYTHON) -c "import distutils.sysconfig, sys; sys.stdout.write(''.join(distutils.sysconfig.get_config_vars('CFLAGS'))+'\n')"`
 PYTHON_CPPFLAGS:=`$(PYTHON) -c "import distutils.sysconfig, sys; sys.stdout.write(distutils.sysconfig.get_python_inc()+'\n')"`
 PYTHON_LDFLAGS:=`$(PYTHON) -c "import distutils.sysconfig, sys; sys.stdout.write('-L'+distutils.sysconfig.get_python_lib(0,1)+' -lpython')"`$(PYTHON_VERSION)
-CGO_LDFLAGS=$(PYTHON_LDFLAGS)
+CGO_LDFLAGS:=$(PYTHON_LDFLAGS)
 CGO_CFLAGS:=-I$(PYTHON_CPPFLAGS) $(PYTHON_CFLAGS)
 
-CGOFILES=\
-	veryhigh.go\
-	exceptions.go\
-	utilities.go\
-	object.go\
-	type.go\
-	none.go\
-	numeric.go\
-	sequence.go\
-	dict.go\
-	otherobjects.go\
-	python.go
+build:
+	CGO_LDFLAGS="$(CGO_LDFLAGS)" CGO_CFLAGS="$(CGO_CFLAGS)" go build .
 
+install:
+	CGO_LDFLAGS="$(CGO_LDFLAGS)" CGO_CFLAGS="$(CGO_CFLAGS)" go install .
 
-#CLEANFILES+=python_test
+test:
+	CGO_LDFLAGS="$(CGO_LDFLAGS)" CGO_CFLAGS="$(CGO_CFLAGS)" go test .
 
-include $(GOROOT)/src/Make.pkg
+all: install
 
-%: install %.go
-	$(GC) $*.go
-	$(LD) -o $@ $*.$O
+PHONY: build install
