Output a smaller representation of true and false.

[cycript.git] / apple.mk

diff --git a/apple.mk b/apple.mk
index b72d40d40d81a2edf74ff2f0bd1f5deabfc2b380..429d4a456e438ec644a4b89fe28d0c78108b3902 100644 (file)
--- 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
 
@@ -81,7 +83,7 @@ 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)
        @
 endef
@@ -152,7 +154,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 $@ $^