Further memory management improvements, fixed some weird vtable bugs with CYThis...

[cycript.git] / makefile

diff --git a/makefile b/makefile
index 45c3e1c27c9214f84844a5768ba0a82853818b89..c89396704997039b4aee9423ccc3c37d70a9d33c 100644 (file)
--- a/makefile
+++ b/makefile
@@ -6,30 +6,31 @@ 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 lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh
-
-libcycript.plist: Bridge.def makefile
-       sed -e 's/^C/0/;s/^F/1/;s/^V/2/' Bridge.def | while read -r line; do \
-           if [[ $$line == '' ]]; then \
-               continue; \
-           fi; \
-           set $$line; \
-           if [[ $$1 =~ [#fl] ]]; then \
-               continue; \
-           fi; \
-           echo "$$2 = ($$1, \"$$3\");";  \
-       done >$@
-
-Cycript.tab.cc Cycript.tab.hh: Cycript.y makefile
-       bison -v $<
+       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
+       { \
+           sed -e 's/^C/0/;s/^F/1/;s/^V/2/' Bridge.def | while read -r line; do \
+               if [[ $$line == '' ]]; then \
+                   continue; \
+               fi; \
+               set $$line; \
+               if [[ $$1 =~ [#fl:] ]]; then \
+                   continue; \
+               fi; \
+               echo "$$2 = ($$1, \"$$3\");";  \
+           done; \
+           grep ^: Bridge.def | sed -e 's/^: \([^ ]*\) \(.*\)/":\1" = "\2";/'; \
+       } >$@
+
+Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.y
+       bison -v --report=state $<
 
 lex.cy.c: Cycript.l
        flex $<
@@ -40,12 +41,30 @@ Struct.hpp:
 #Parser.hpp: Parser.py Parser.dat
 #      ./Parser.py <Parser.dat >$@
 
-libcycript.dylib: Library.mm makefile $(menes)/mobilesubstrate/substrate.h sig/*.[ch]pp Struct.hpp Parser.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh
-       $(target)g++ -dynamiclib -mthumb -g0 -O2 -Wall -Werror -o $@ $(filter %.cpp,$^) $(filter %.cc,$^) $(filter %.c,$^) $(filter %.mm,$^) -lobjc -I$(menes)/mobilesubstrate $(link) $(flags) #-DYYDEBUG=1
+%.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.cpp 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 -framework UIKit
        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 -lapr-1
        ldid -S cycript
 
 package: all
@@ -69,6 +88,6 @@ package: all
 
 test: package
        dpkg -i $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
-       cycript
+       cycript /Applications/HelloCycript.app/HelloCycript
 
 .PHONY: all clean extra package