X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/9185d5ef70289d99e212f2dd04457b05716e222e..cb02f8aec13cb7ffea9631c401293e80447e6ae7:/makefile

diff --git a/makefile b/makefile
index 2f95a53..f85f998 100644
--- a/makefile
+++ b/makefile
@@ -1,13 +1,13 @@
+SHELL := $(shell which bash 2>/dev/null)
+
 ifndef PKG_TARG
 target :=
 else
 target := $(PKG_TARG)-
 endif
 
-#flags := -g3 -O0 -DYYDEBUG=1
-flags := -g0 -O3
-flags += -Wall -Werror -Wno-parentheses -I. -fno-common
-flags += -I$(shell apr-1-config --includedir)
+flags :=
+objc :=
 
 svn := $(shell svnversion)
 
@@ -24,19 +24,33 @@ code := ffi_type.o parse.o
 code += Replace.o Output.o
 code += Cycript.tab.o lex.cy.o
 code += Network.o Parser.o
+code += JavaScriptCore.o Library.o
 
 filters := C
-ldid := echo
+ldid := true
 dll := so
 apr := $(shell apr-1-config --link-ld)
-library := $(apr) -lffi #-lsubstrate
-link := $(apr) -lreadline
+library := $(apr) -lffi -liconv
+console := $(apr) -lreadline
+depends :=
 
 uname_s := $(shell uname -s)
 uname_p := $(shell uname -p)
 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk
 
+ifeq ($(filter ObjectiveC,$(filters)),)
+ifneq ($(shell which gnustep-config 2>/dev/null),)
+include GNUstep.mk
+endif
+endif
+
+#flags += -g3 -O0 -DYYDEBUG=1
+flags += -g0 -O3
+flags += -Wall -Werror -Wno-parentheses #-Wno-unused
+flags += -fPIC -fno-common
+flags += -I. -I$(shell apr-1-config --includedir)
+
 all += libcycript.$(dll)
 
 ifdef arch
@@ -44,20 +58,13 @@ deb := $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version:
 
 all: $(deb)
 
+extra:
+
 $(deb): $(all)
 	rm -rf package
 	mkdir -p package/DEBIAN
-	sed -e 's/#/$(svn)/' control >package/DEBIAN/control
-	mkdir -p package/System/Library/LaunchDaemons
-	#cp -a com.saurik.Cyrver.plist package/System/Library/LaunchDaemons
-	mkdir -p package/Library/MobileSubstrate/DynamicLibraries
-	if [[ -e Settings.plist ]]; then \
-	    mkdir -p package/Library/PreferenceLoader/Preferences; \
-	    cp -a Settings.png package/Library/PreferenceLoader/Preferences/CycriptIcon.png; \
-	    cp -a Settings.plist package/Library/PreferenceLoader/Preferences/Cycript.plist; \
-	fi
-	if [[ -e Tweak.plist ]]; then cp -a Tweak.plist package/Library/MobileSubstrate/DynamicLibraries/Cycript.plist; fi
-	cp -a Cycript.$(dll) package/Library/MobileSubstrate/DynamicLibraries
+	sed -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(svn)/;s/%/$(arch)/' control >package/DEBIAN/control
+	$(MAKE) extra
 	mkdir -p package/usr/{bin,lib,sbin}
 	cp -a libcycript.$(dll) package/usr/lib
 	cp -a cycript package/usr/bin
@@ -82,7 +89,10 @@ libcycript.plist: Bridge.def
 	    echo '})'; \
 	} >$@
 
-Cycript.y: Cycript.y.in
+%.y: %.y.in
+	./Filter.sh <$< >$@ $(filters)
+
+%.l: %.l.in
 	./Filter.sh <$< >$@ $(filters)
 
 Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.y
@@ -97,25 +107,26 @@ lex.cy.c: Cycript.l
 %.o: sig/%.cpp
 	$(target)g++ $(flags) -c -o $@ $<
 
-Cycript.tab.o: Cycript.tab.cc Cycript.tab.hh Parser.hpp Pooling.hpp
+Cycript.tab.o: Cycript.tab.cc $(header)
 	$(target)g++ $(flags) -c -o $@ $<
 
-lex.cy.o: lex.cy.c Cycript.tab.hh Parser.hpp Pooling.hpp
+lex.cy.o: lex.cy.c $(header)
 	$(target)g++ $(flags) -c -o $@ $<
 
 %.o: %.cpp $(header)
 	$(target)g++ $(flags) -c -o $@ $<
 
+#objc := -x c++
 %.o: %.mm $(header)
-	$(target)g++ $(flags) -c -o $@ $<
+	$(target)g++ $(objc) $(flags) -c -o $@ $<
 
 libcycript.$(dll): $(code)
-	$(target)g++ $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library)
-	$(ldid) -S $@
+	$(target)g++ $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library) $(link)
+	$(ldid) $@
 
 cycript: Console.o libcycript.$(dll)
-	$(target)g++ $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(link)
-	$(ldid) -S cycript
+	$(target)g++ $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(console) $(link)
+	$(ldid) cycript
 
 package: $(deb)