X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/42311506d531ad98d674cbaa4768453cf8950451..a5662a5364816f852acb056d5c2b2fc94e0c0a5c:/apple.mk

diff --git a/apple.mk b/apple.mk
index b72d40d..f599905 100644
--- a/apple.mk
+++ b/apple.mk
@@ -1,22 +1,23 @@
 # Cycript - Optimizing JavaScript Compiler/Runtime
-# Copyright (C) 2009-2013  Jay Freeman (saurik)
+# Copyright (C) 2009-2015  Jay Freeman (saurik)
 
-# GNU General Public License, Version 3 {{{
+# GNU Affero General Public License, Version 3 {{{
 #
-# Cycript is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published
-# by the Free Software Foundation, either version 3 of the License,
-# or (at your option) any later version.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 #
-# Cycript is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
+# GNU Affero General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License
-# along with Cycript.  If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Affero General Public License
+# 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