Fixed a minor bug introduced today in CYClause serialization.

[cycript.git] / makefile

diff --git a/makefile b/makefile
index a01b0460da44d72f5d0f1e90c69cbbf9f10013b4..bda4406d8747d10df62379ed187cda30c907c8a9 100644 (file)
--- a/makefile
+++ b/makefile
@@ -6,7 +6,9 @@ endif
 
 #flags := -g3 -O0 -DYYDEBUG=1
 flags := -g0 -O3
-flags += -Wall -Werror -I. -fno-common
+flags += -Wall -Werror -Wno-parentheses
+flags += -fPIC -fno-common
+flags += -I. -I$(shell apr-1-config --includedir)
 
 svn := $(shell svnversion)
 
@@ -19,8 +21,17 @@ arch := $(shell $(dpkg_architecture) -qDEB_HOST_ARCH 2>/dev/null)
 endif
 
 header := Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp
+code := ffi_type.o parse.o 
+code += Replace.o Output.o
+code += Cycript.tab.o lex.cy.o
+code += Network.o Parser.o
 
+filters := C
+ldid := echo
 dll := so
+apr := $(shell apr-1-config --link-ld)
+library := $(apr) -lffi
+console := $(apr) -lreadline
 
 uname_s := $(shell uname -s)
 uname_p := $(shell uname -p)
@@ -47,9 +58,9 @@ $(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
+       cp -a Cycript.$(dll) package/Library/MobileSubstrate/DynamicLibraries
        mkdir -p package/usr/{bin,lib,sbin}
-       cp -a libcycript.dylib package/usr/lib
+       cp -a libcycript.$(dll) package/usr/lib
        cp -a cycript package/usr/bin
        #cp -a cyrver package/usr/sbin
        cp -a libcycript.plist package/usr/lib
@@ -59,7 +70,7 @@ endif
 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 cyrver
+       rm -f *.o libcycript.$(dll) cycript libcycript.plist Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh cyrver Cycript.y
 
 libcycript.plist: Bridge.def
        { \
@@ -72,6 +83,9 @@ libcycript.plist: Bridge.def
            echo '})'; \
        } >$@
 
+Cycript.y: Cycript.y.in
+       ./Filter.sh <$< >$@ $(filters)
+
 Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.y
        bison -v --report=state $<
 
@@ -96,28 +110,13 @@ 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 $@
-
-libcycript.$(dll): ffi_type.o parse.o Replace.o Output.o Cycript.tab.o lex.cy.o Library.o
-       $(target)g++ $(flags) -dynamiclib -o $@ $(filter %.o,$^) \
-           -install_name /usr/lib/libcycript.dylib \
-           -lobjc -lapr-1 -lffi -lsubstrate \
-           -framework CoreFoundation -framework Foundation \
-           -framework CFNetwork \
-           -framework JavaScriptCore -framework WebCore
-       ldid -S $@
+libcycript.$(dll): $(code)
+       $(target)g++ $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library) $(link)
+       $(ldid) -S $@
 
 cycript: Console.o libcycript.$(dll)
-       $(target)g++ $(flags) -o $@ $(filter %.o,$^) \
-           -lobjc -lapr-1 -lreadline \
-           -L. -lcycript \
-           -framework Foundation -framework CoreFoundation \
-           -framework JavaScriptCore -framework UIKit
-       ldid -S cycript
+       $(target)g++ $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(console) $(link)
+       $(ldid) -S cycript
 
 package: $(deb)