X-Git-Url: https://git.saurik.com/cycript.git/blobdiff_plain/14ec9e00ac4903521e92002604eb56ed7cde036d..c7aa54aa39cb2e43f866b7564ce5b689313b5d8b:/makefile?ds=sidebyside

diff --git a/makefile b/makefile
index ed5ae28..8e1d55f 100644
--- a/makefile
+++ b/makefile
@@ -6,6 +6,7 @@ else
 target := $(PKG_TARG)-
 endif
 
+gcc := g++
 flags ?= -g3 -O0 -DYYDEBUG=1
 
 paths := $(foreach path,$(paths),$(wildcard $(path)))
@@ -22,7 +23,7 @@ ifneq ($(dpkg_architecture),)
 arch := $(shell $(dpkg_architecture) -qDEB_HOST_ARCH 2>/dev/null)
 endif
 
-header := Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp Internal.hpp Error.hpp String.hpp Exception.hpp Standard.hpp Context.hpp
+header := Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp Internal.hpp Error.hpp String.hpp Exception.hpp Standard.hpp
 
 code := 
 code += Replace.o Output.o
@@ -36,7 +37,7 @@ filters := #E4X
 ldid := true
 entitle := $(ldid)
 dll := so
-apr := -lapr-1
+apr := $(shell apr-1-config --link-ld)
 library := 
 console := $(apr) -lreadline
 depends :=
@@ -70,18 +71,21 @@ all: $(deb)
 extra::
 
 ifeq ($(depends)$(dll),dylib)
-control: control.in cycript libcycript.dylib
+control.tmp: control.in cycript libcycript.dylib
 	sed -e 's/&/'"$$(dpkg-query -S $$(otool -lah cycript *.dylib | grep dylib | grep -v ':$$' | sed -e 's/^ *name //;s/ (offset [0-9]*)$$//' | sort -u) 2>/dev/null | sed -e 's/:.*//; /^cycript$$/ d; s/$$/,/' | sort -u | tr '\n' ' ')"'/;s/, $$//;s/#/$(svn)/;s/%/$(arch)/' $< >$@
 else
 ifeq ($(depends)$(dll),so)
-control: control.in cycript libcycript.so
+control.tmp: control.in cycript libcycript.so
 	sed -e 's/&/'"$$(dpkg-query -S $$(ldd cycript libcycript.so | sed -e '/:$$/ d; s/^[ \t]*\([^ ]* => \)\?\([^ ]*\) .*/\2/' | sort -u) 2>/dev/null | sed -e 's/:.*//; /^cycript$$/ d; s/$$/,/' | sort -u | tr '\n' ' ')"'/;s/, $$//;s/#/$(svn)/;s/%/$(arch)/' $< >$@
 else
-control: control.in
+control.tmp: control.in
 	sed -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(svn)/;s/%/$(arch)/' $< >$@
 endif
 endif
 
+control: control.tmp
+	[[ -e control ]] && diff control control.tmp &>/dev/null || cp -pRf control.tmp control
+
 $(deb): $(all) control
 	rm -rf package
 	mkdir -p package/DEBIAN
@@ -97,7 +101,7 @@ endif
 all: $(all)
 
 clean:
-	rm -f *.o libcycript.$(dll) $(all) Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh cyrver Cycript.y Cycript.l control
+	rm -f *.o libcycript.$(dll) $(all) Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh cyrver Cycript.y Cycript.l control Bridge.hpp
 
 %.y: %.y.in
 	./Filter.sh <$< >$@ $(filters)
@@ -115,24 +119,24 @@ lex.cy.c: Cycript.l
 #	./Parser.py <Parser.dat >$@
 
 Cycript.tab.o: Cycript.tab.cc $(header)
-	$(target)g++ $(flags) -c -o $@ $<
+	$(target)$(gcc) $(flags) -c -o $@ $<
 
 lex.cy.o: lex.cy.c $(header)
-	$(target)g++ $(flags) -c -o $@ $<
+	$(target)$(gcc) $(flags) -c -o $@ $<
 
 %.o: %.cpp $(header)
-	$(target)g++ $(flags) -c -o $@ $<
+	$(target)$(gcc) $(flags) -c -o $@ $<
 
 #objc := -x c++
 %.o: %.mm $(header)
-	$(target)g++ $(objc) $(flags) -c -o $@ $<
+	$(target)$(gcc) $(objc) $(flags) -c -o $@ $<
 
 libcycript.$(dll): $(code)
-	$(target)g++ $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library) $(link)
+	$(target)$(gcc) $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library) $(link)
 	$(ldid) $@
 
 cycript: Console.o libcycript.$(dll) $(inject)
-	$(target)g++ $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(console) $(link)
+	$(target)$(gcc) $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(console) $(link)
 	$(entitle) cycript
 
 package: $(deb)
@@ -140,7 +144,7 @@ package: $(deb)
 test: $(deb)
 	dpkg -i $(deb)
 	if [[ -e target.cy ]]; then cycript -c target.cy && echo; fi
-	if [[ -e jquery.js ]]; then /usr/bin/time cycript -c jquery.js >jquery.cyc.js; gzip -9c jquery.cyc.js >jquery.cyc.js.gz; ls -la jquery.{cyc,yui}.js{,.gz}; fi
+	if [[ -e jquery.js ]]; then /usr/bin/time cycript -c jquery.js >jquery.cyc.js; gzip -9c jquery.cyc.js >jquery.cyc.js.gz; wc -c jquery.{mam,gcc,cyc,bak,yui}.js; wc -c jquery.{cyc,gcc,bak,mam,yui}.js.gz; fi
 	if [[ -e test.cy ]]; then cycript test.cy; fi
 
-.PHONY: all clean extra package control
+.PHONY: all clean extra package control.tmp