X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/b6961e537b5468dc0458808fdacba4a3291e1d48..59cd74c129547a58f5e235041e78181afbc6df78:/makefile

diff --git a/makefile b/makefile
index b4cf765..486c448 100644
--- a/makefile
+++ b/makefile
@@ -35,7 +35,7 @@ filters := C #E4X
 ldid := true
 entitle := $(ldid)
 dll := so
-apr := $(shell apr-1-config --link-ld)
+apr := -lapr-1
 library := $(apr) -lffi -lsqlite3
 console := $(apr) -lreadline
 depends :=
@@ -49,13 +49,13 @@ uname_p ?= $(shell uname -p)
 
 ifeq ($(filter ObjectiveC,$(filters)),)
 ifneq ($(shell which gnustep-config 2>/dev/null),)
-#include GNUstep.mk
+include GNUstep.mk
 endif
 endif
 
 flags += -Wall -Werror -Wno-parentheses #-Wno-unused
 flags += -fPIC -fno-common
-flags += -I. -I$(shell apr-1-config --includedir)
+flags += -I. -Iinclude -I$(shell apr-1-config --includedir)
 
 all += libcycript.$(dll)
 
@@ -66,24 +66,29 @@ all: $(deb)
 
 extra:
 
-ifeq ($(depends),)
+ifeq ($(depends)$(dll),dylib)
+control: control.in cycript libcycript.dylib
+	sed -e 's/&/'"$$(dpkg-query -S $$(otool -lah cycript *.dylib | grep dylib | grep -v ':$$' | sed -e 's/^ *name //;s/ (offset [0-9]*)$$//' | sort -u) 2>/dev/null | sed -e 's/:.*//; /^cycript$$/ d; s/$$/,/' | sort -u | tr '\n' ' ')"'/;s/, $$//;s/#/$(svn)/;s/%/$(arch)/' $< >$@
+else
+ifeq ($(depends)$(dll),so)
 control: control.in cycript libcycript.so
 	sed -e 's/&/'"$$(dpkg-query -S $$(ldd cycript libcycript.so | sed -e '/:$$/ d; s/^[ \t]*\([^ ]* => \)\?\([^ ]*\) .*/\2/' | sort -u) 2>/dev/null | sed -e 's/:.*//; /^cycript$$/ d; s/$$/,/' | sort -u | tr '\n' ' ')"'/;s/, $$//;s/#/$(svn)/;s/%/$(arch)/' $< >$@
 else
 control: control.in
 	sed -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(svn)/;s/%/$(arch)/' $< >$@
 endif
+endif
 
 $(deb): $(all) control
 	rm -rf package
 	mkdir -p package/DEBIAN
-	cp -a control package/DEBIAN
+	cp -pR control package/DEBIAN
 	$(restart) extra
 	mkdir -p package/usr/{bin,lib,sbin}
-	cp -a libcycript.$(dll) package/usr/lib
-	cp -a cycript package/usr/bin
-	#cp -a cyrver package/usr/sbin
-	cp -a libcycript.db package/usr/lib
+	cp -pR libcycript.$(dll) package/usr/lib
+	cp -pR cycript package/usr/bin
+	#cp -pR cyrver package/usr/sbin
+	cp -pR libcycript.db package/usr/lib
 	dpkg-deb -b package $(deb)
 endif
 
@@ -99,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'"'"');/'; \
-	} | sqlite3 libcycript.db
+	} | tee libcycript.sql | sqlite3 libcycript.db
 
 %.y: %.y.in
 	./Filter.sh <$< >$@ $(filters)
@@ -143,4 +148,4 @@ test: $(deb)
 	dpkg -i $(deb)
 	cycript test.cy
 
-.PHONY: all clean extra package
+.PHONY: all clean extra package control