Remove flex/gperf hacks (this was fixed upstream).

[cycript.git] / apple.mk

diff --git a/apple.mk b/apple.mk
index bfaf2207dddd0c1677f6e11418afb7d848706f9e..f59990530d54a0e875714bf061a12023316aa9b6 100644 (file)
--- a/apple.mk
+++ b/apple.mk
@@ -1,5 +1,5 @@
 # Cycript - Optimizing JavaScript Compiler/Runtime
-# Copyright (C) 2009-2014  Jay Freeman (saurik)
+# Copyright (C) 2009-2015  Jay Freeman (saurik)
 
 # GNU Affero General Public License, Version 3 {{{
 #
@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 # }}}
 
+.SECONDARY:
 .DELETE_ON_ERROR:
 SHELL := /bin/bash
 
@@ -44,6 +45,7 @@ framework += Headers/Cycript.h
 framework := $(foreach os,ios osx,$(foreach file,$(framework),Cycript.$(os)/Cycript.framework/$(file)))
 
 links := 
+links += Cycript.lib/cynject
 links += Cycript.lib/libsubstrate.dylib
 links += Cycript.lib/cycript0.9
 
@@ -72,8 +74,7 @@ $(deb): Cycript.lib/cycript Cycript.lib/libcycript.dylib
 deb: $(deb)
        ln -sf $< cycript.deb
 
-clean:
-       rm -rf cycript Cycript.lib libcycript*.o
+clean := 
 
 # make stubbornly refuses to believe that these @'s are bugs
 # http://osdir.com/ml/help-make-gnu/2012-04/msg00008.html
@@ -81,9 +82,12 @@ clean:
 define build_any
 .PHONY: build-$(1)-$(2)
 build-$(1)-$(2):
-       $(MAKE) -C build.$(1)-$(2)
+       $$(MAKE) -C build.$(1)-$(2)
 build.$(1)-$(2)/.libs/libcycript.a: build-$(1)-$(2)
        @
+clean-$(1)-$(2):
+       $$(MAKE) -C build.$(1)-$(2) clean
+clean += clean-$(1)-$(2)
 endef
 
 define build_lib
@@ -126,6 +130,9 @@ endef
 
 $(foreach arch,armv6 arm64,$(eval $(call build_arm,$(arch))))
 
+clean: $(clean)
+       rm -rf cycript Cycript.lib libcycript*.o
+
 Cycript.lib/libcycript.dylib: build.osx-i386/.libs/libcycript.dylib build.osx-x86_64/.libs/libcycript.dylib build.ios-armv6/.libs/libcycript.dylib build.ios-arm64/.libs/libcycript.dylib
        @mkdir -p $(dir $@)
        $(lipo) -create -output $@ $^
@@ -152,7 +159,7 @@ Cycript.lib/libcycript-sim.dylib: build.sim-i386/.libs/libcycript.dylib build.si
 
 libcycript-%.o: build.%/.libs/libcycript.a xcode.map
        @mkdir -p $(dir $@)
-       ld -r -arch $$($(lipo) -detailed_info $< | sed -e '/^Non-fat file: / ! d; s/.*: //') -o $@ -all_load -exported_symbols_list xcode.map $< libffi.a
+       ld -r -arch $$($(lipo) -detailed_info $< | sed -e '/^Non-fat file: / ! d; s/.*: //') -o $@ -all_load -exported_symbols_list xcode.map -x $< libffi.a
 
 libcycript-ios.o: libcycript-ios-armv6.o libcycript-ios-armv7.o libcycript-ios-armv7s.o libcycript-ios-arm64.o libcycript-sim-i386.o libcycript-sim-x86_64.o
        $(lipo) -create -output $@ $^
@@ -176,7 +183,12 @@ cycript: cycript.in
        cp -af $< $@
        chmod 755 $@
 
-install: Cycript.lib/cycript Cycript.lib/libcycript.dylib Cycript.lib/libcycript-sys.dylib Cycript.lib/libcycript-sim.dylib
+local := Cycript.lib/cycript Cycript.lib/libcycript.dylib Cycript.lib/libcycript-sys.dylib Cycript.lib/libcycript-sim.dylib
+
+debug: $(local)
+       DYLD_LIBRARY_PATH=Cycript.lib lldb Cycript.lib/cycript
+
+install: $(local)
        sudo cp -af $(filter-out %.dylib,$^) /usr/bin
        sudo cp -af $(filter %.dylib,$^) /usr/lib
 
@@ -184,4 +196,4 @@ install: Cycript.lib/cycript Cycript.lib/libcycript.dylib Cycript.lib/libcycript
 cast: $(zip)
        appcast.sh cycript/mac $(monotonic) $(version) $< "$(CYCRIPT_CHANGES)"
 
-.PHONY: all cast clean install zip
+.PHONY: all cast clean debug install zip