Changed the syntax error arrow to start at the beginning of the line to setup for...

[cycript.git] / makefile

diff --git a/makefile b/makefile
index a1739a504194be80a4287e9331d46e556769fe09..6827307e8b8432fe0c8e52da3fa31ab28682df97 100644 (file)
--- a/makefile
+++ b/makefile
@@ -4,12 +4,15 @@ else
 target := $(PKG_TARG)-
 endif
 
-flags := -mthumb -g3 -O0 -Wall -Werror -I. -fno-common
+#flags := -g3 -O0 -DYYDEBUG=1
+flags := -g0 -O3
+
+flags += -Wall -Werror -I. -fno-common
 flags += -F${PKG_ROOT}/System/Library/PrivateFrameworks
 
 svn := $(shell svnversion)
 deb := $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2 | sed -e 's/\#/$(svn)/')_iphoneos-arm.deb
-all := cycript libcycript.dylib libcycript.plist
+all := cycript libcycript.dylib libcycript.plist Cycript.dylib #cyrver
 
 header := Cycript.tab.hh Parser.hpp Pooling.hpp Struct.hpp cycript.hpp
 
@@ -18,7 +21,7 @@ $(deb):
 all: $(all)
 
 clean:
-       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
+       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 cyrver
 
 libcycript.plist: Bridge.def
        { \
@@ -58,6 +61,18 @@ lex.cy.o: lex.cy.c Cycript.tab.hh Parser.hpp Pooling.hpp
 %.o: %.mm $(header)
        $(target)g++ $(flags) -c -o $@ $<
 
+cyrver: Server.o
+       $(target)g++ $(flags) -o $@ $(filter %.o,$^) \
+           -lobjc -lapr-1 -lsubstrate \
+           -framework CoreFoundation -framework CFNetwork
+       ldid -S $@
+
+Cycript.dylib: Connector.o
+       $(target)g++ $(flags) -dynamiclib -o $@ $(filter %.o,$^) \
+           -lobjc -lapr-1 -lsubstrate \
+           -framework CoreFoundation
+       ldid -S $@
+
 libcycript.dylib: ffi_type.o parse.o Output.o Cycript.tab.o lex.cy.o Library.o
        $(target)g++ $(flags) -dynamiclib -o $@ $(filter %.o,$^) \
            -install_name /usr/lib/libcycript.dylib \
@@ -67,7 +82,7 @@ libcycript.dylib: ffi_type.o parse.o Output.o Cycript.tab.o lex.cy.o Library.o
            -framework JavaScriptCore -framework WebCore
        ldid -S $@
 
-cycript: Application.o libcycript.dylib
+cycript: Console.o libcycript.dylib
        $(target)g++ $(flags) -o $@ $(filter %.o,$^) \
            -lobjc -lapr-1 -lreadline \
            -L. -lcycript \
@@ -79,6 +94,8 @@ $(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; \
@@ -86,11 +103,11 @@ $(deb): $(all)
            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.dylib package/Library/MobileSubstrate/DynamicLibraries
-       mkdir -p package/usr/{bin,lib}
+       cp -a Cycript.dylib package/Library/MobileSubstrate/DynamicLibraries
+       mkdir -p package/usr/{bin,lib,sbin}
        cp -a libcycript.dylib package/usr/lib
-       ln -s /usr/lib/libcycript.dylib package/Library/MobileSubstrate/DynamicLibraries/Cycript.dylib
        cp -a cycript package/usr/bin
+       #cp -a cyrver package/usr/sbin
        cp -a libcycript.plist package/usr/lib
        dpkg-deb -b package $(deb)