Fixed argument serialization comma bug.

[cycript.git] / makefile

diff --git a/makefile b/makefile
index bbeb938b6fdd20bb8a3b4984c0674c5fb8308c52..d178765a637fb617c542dc382bbc4cb545273d8b 100644 (file)
--- a/makefile
+++ b/makefile
@@ -6,17 +6,15 @@ endif
 
 package:
 
-flags := -framework CFNetwork -framework JavaScriptCore -framework WebCore -install_name /usr/lib/libcycript.dylib -I.
-menes := $(shell cd ~; pwd)/menes
-
-link := -framework CoreFoundation -framework Foundation -F${PKG_ROOT}/System/Library/PrivateFrameworks -L$(menes)/mobilesubstrate -lsubstrate -lapr-1 -lffi
+flags := -mthumb -g3 -O0 -Wall -Werror -I. -fno-common
+flags += -F${PKG_ROOT}/System/Library/PrivateFrameworks
 
 all: cycript libcycript.dylib libcycript.plist
 
 clean:
-       rm -f libcycript.dylib cycript libcycript.plist Struct.hpp
+       rm -f *.o libcycript.dylib cycript libcycript.plist Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh
 
-libcycript.plist: Bridge.def makefile
+libcycript.plist: Bridge.def
        sed -e 's/^C/0/;s/^F/1/;s/^V/2/' Bridge.def | while read -r line; do \
            if [[ $$line == '' ]]; then \
                continue; \
@@ -28,15 +26,42 @@ libcycript.plist: Bridge.def makefile
            echo "$$2 = ($$1, \"$$3\");";  \
        done >$@
 
+Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.y
+       bison -v --report=state $<
+
+lex.cy.c: Cycript.l
+       flex $<
+
 Struct.hpp:
        $$($(target)gcc -print-prog-name=cc1obj) -print-objc-runtime-info </dev/null >$@
 
-libcycript.dylib: Library.mm makefile $(menes)/mobilesubstrate/substrate.h sig/*.[ch]pp Struct.hpp
-       $(target)g++ -dynamiclib -mthumb -g0 -O2 -Wall -Werror -o $@ $(filter %.cpp,$^) $(filter %.mm,$^) -lobjc -I$(menes)/mobilesubstrate $(link) $(flags)
+#Parser.hpp: Parser.py Parser.dat
+#      ./Parser.py <Parser.dat >$@
+
+%.o: sig/%.cpp
+       $(target)g++ $(flags) -c -o $@ $<
+
+Cycript.tab.o: Cycript.tab.cc Cycript.tab.hh Parser.hpp Pooling.hpp
+       $(target)g++ $(flags) -c -o $@ $<
+
+lex.cy.o: lex.cy.c Cycript.tab.hh Parser.hpp Pooling.hpp
+       $(target)g++ $(flags) -c -o $@ $<
+
+Output.o: Output.cpp Parser.hpp Pooling.hpp
+       $(target)g++ $(flags) -c -o $@ $<
+
+Library.o: Library.mm Cycript.tab.hh Parser.hpp Pooling.hpp Struct.hpp cycript.hpp
+       $(target)g++ $(flags) -c -o $@ $<
+
+Application.o: Application.mm Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp
+       $(target)g++ $(flags) -c -o $@ $<
+
+libcycript.dylib: ffi_type.o parse.o Output.o Cycript.tab.o lex.cy.o Library.o
+       $(target)g++ $(flags) -dynamiclib -o $@ $(filter %.o,$^) -lobjc -framework CFNetwork -framework JavaScriptCore -framework WebCore -install_name /usr/lib/libcycript.dylib -framework CoreFoundation -framework Foundation -L$(menes)/mobilesubstrate -lsubstrate -lapr-1 -lffi
        ldid -S $@
 
-cycript: Application.mm libcycript.dylib
-       $(target)g++ -g0 -O2 -Wall -Werror -o $@ $(filter %.mm,$^) -framework UIKit -framework Foundation -framework CoreFoundation -lobjc libcycript.dylib
+cycript: Application.o libcycript.dylib
+       $(target)g++ $(flags) -o $@ $(filter %.o,$^) -framework UIKit -framework Foundation -framework CoreFoundation -lobjc libcycript.dylib -lreadline -framework JavaScriptCore
        ldid -S cycript
 
 package: all
@@ -53,9 +78,13 @@ package: all
        #cp -a Cycript.dylib package/Library/MobileSubstrate/DynamicLibraries
        mkdir -p package/usr/{bin,lib}
        cp -a libcycript.dylib package/usr/lib
-       ln -s /usr/lib/libcycript.dylib package/Library/MobileSubstrate/DynamicLibraries/Cycript.dylib
+       #ln -s /usr/lib/libcycript.dylib package/Library/MobileSubstrate/DynamicLibraries/Cycript.dylib
        cp -a cycript package/usr/bin
        cp -a libcycript.plist package/usr/lib
        dpkg-deb -b package $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
 
+test: package
+       dpkg -i $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
+       cycript
+
 .PHONY: all clean extra package