OMG, the last fix didn't even work, because Apple's compiler doesn't even consider...

[cycript.git] / makefile

diff --git a/makefile b/makefile
index 69ec15e05940fcd9e2091f059f4b0cbe9e4f3a14..486c4481c26892e0cfa1cf8127342fe831df5891 100644 (file)
--- a/makefile
+++ b/makefile
@@ -35,7 +35,7 @@ filters := C #E4X
 ldid := true
 entitle := $(ldid)
 dll := so
 ldid := true
 entitle := $(ldid)
 dll := so

-apr := $(shell apr-1-config --link-ld)
+apr := -lapr-1

 library := $(apr) -lffi -lsqlite3
 console := $(apr) -lreadline
 depends :=
 library := $(apr) -lffi -lsqlite3
 console := $(apr) -lreadline
 depends :=


@@ -49,7 +49,7 @@ uname_p ?= $(shell uname -p)
 
 ifeq ($(filter ObjectiveC,$(filters)),)
 ifneq ($(shell which gnustep-config 2>/dev/null),)
 
 ifeq ($(filter ObjectiveC,$(filters)),)
 ifneq ($(shell which gnustep-config 2>/dev/null),)

-#include GNUstep.mk
+include GNUstep.mk

 endif
 endif
 
 endif
 endif
 


@@ -104,7 +104,7 @@ libcycript.db: Bridge.def
            grep '^[CFV]' Bridge.def | sed -e 's/^C/0/;s/^F/1/;s/^V/2/' | sed -e 's/"/\\"/g;s/^\([^ ]*\) \([^ ]*\) \(.*\)$$/insert into "bridge" ("mode", "name", "value") values (\1, '"'"'\2'"'"', '"'"'\3'"'"');/'; \
            grep '^:' Bridge.def | sed -e 's/^: \([^ ]*\) \(.*\)/insert into "bridge" ("mode", "name", "value") values (-1, '"'"'\1'"'"', '"'"'\2'"'"');/'; \
            grep '^[EST]' Bridge.def | sed -e 's/^S/3/;s/^T/4/;s/^E/5/' | sed -e 's/^5\(.*\)$$/4\1 i/' | sed -e 's/^\([^ ]*\) \([^ ]*\) \(.*\)$$/insert into "bridge" ("mode", "name", "value") values (\1, '"'"'\2'"'"', '"'"'\3'"'"');/'; \
            grep '^[CFV]' Bridge.def | sed -e 's/^C/0/;s/^F/1/;s/^V/2/' | sed -e 's/"/\\"/g;s/^\([^ ]*\) \([^ ]*\) \(.*\)$$/insert into "bridge" ("mode", "name", "value") values (\1, '"'"'\2'"'"', '"'"'\3'"'"');/'; \
            grep '^:' Bridge.def | sed -e 's/^: \([^ ]*\) \(.*\)/insert into "bridge" ("mode", "name", "value") values (-1, '"'"'\1'"'"', '"'"'\2'"'"');/'; \
            grep '^[EST]' Bridge.def | sed -e 's/^S/3/;s/^T/4/;s/^E/5/' | sed -e 's/^5\(.*\)$$/4\1 i/' | sed -e 's/^\([^ ]*\) \([^ ]*\) \(.*\)$$/insert into "bridge" ("mode", "name", "value") values (\1, '"'"'\2'"'"', '"'"'\3'"'"');/'; \

-       } | sqlite3 libcycript.db
+       } | tee libcycript.sql | sqlite3 libcycript.db

 
 %.y: %.y.in
        ./Filter.sh <$< >$@ $(filters)
 
 %.y: %.y.in
        ./Filter.sh <$< >$@ $(filters)


@@ -148,4 +148,4 @@ test: $(deb)
        dpkg -i $(deb)
        cycript test.cy
 
        dpkg -i $(deb)
        cycript test.cy
 

-.PHONY: all clean extra package
+.PHONY: all clean extra package control