Makefile now works with embedded libyaml.
diff --git a/.bzrignore b/.bzrignore new file mode 100644 index 0000000..52c98ab --- /dev/null +++ b/.bzrignore
@@ -0,0 +1,14 @@ +[568].out +_* +*.cgo*.* + +yaml-*/stamp-h1 +yaml-*/Makefile +yaml-*/*/Makefile +yaml-*/libtool +yaml-*/config* +yaml-*/*/*.lo +yaml-*/*/*.la +yaml-*/*/.libs +yaml-*/*/.deps +yaml-*/tests/*
diff --git a/Makefile b/Makefile index fb66f31..f0f2534 100644 --- a/Makefile +++ b/Makefile
@@ -1,5 +1,8 @@ include $(GOROOT)/src/Make.inc +YAML=yaml-0.1.3 +LIBYAML=$(PWD)/$(YAML)/src/.libs/libyaml.a + TARG=goyaml GOFILES=\ @@ -8,16 +11,19 @@ CGOFILES=\ parser.go\ -LIBYAML=/usr/lib/libyaml.a -LIBYAML_OFILES=$(shell ar t $(LIBYAML)) - CGO_LDFLAGS+=-lm -lpthread -CGO_OFILES+=$(LIBYAML_OFILES:%=_lib/%) +CGO_OFILES+=_lib/*.o + + +all: package $(CGO_OFILES): $(LIBYAML) - @mkdir _lib + @mkdir -p _lib cd _lib && ar x $(LIBYAML) +$(LIBYAML): + cd $(YAML) && CFLAGS=-fpic ./configure && make + CLEANFILES=_lib include $(GOROOT)/src/Make.pkg