Fixed the ::Class bug and attempted to further abstract GNUstep.

[cycript.git] / makefile

diff --git a/makefile b/makefile
index 99ef08de3b468376e3f9a914f66cf7ea7c9b9c6e..84a03f869d5bf370920e05d9de86201a5cacdc47 100644 (file)
--- a/makefile
+++ b/makefile
@@ -1,17 +1,16 @@
+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 -I. -fno-common
+flags :=
+objc :=
 
 svn := $(shell svnversion)
 
-filters := C
-
 all:
 all := libcycript.plist cycript
 
@@ -21,15 +20,37 @@ 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 Replace.o Output.o Cycript.tab.o lex.cy.o Library.o
+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
 dll := so
+apr := $(shell apr-1-config --link-ld)
+library := $(apr) -lffi
+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
+flags += -fPIC -fno-common
+flags += -I. -I$(shell apr-1-config --includedir)
+
 all += libcycript.$(dll)
 
 ifdef arch
@@ -37,22 +58,15 @@ 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.dylib 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.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
@@ -62,7 +76,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
        { \
@@ -100,30 +114,15 @@ lex.cy.o: lex.cy.c Cycript.tab.hh Parser.hpp Pooling.hpp
        $(target)g++ $(flags) -c -o $@ $<
 
 %.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 $@
+       $(target)g++ $(flags) -c -o $@ $< $(objc)
 
 libcycript.$(dll): $(code)
-       $(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 $@
+       $(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)