Actually committing the file that fixed the int to size_t for the lexer warning.

[cycript.git] / makefile

diff --git a/makefile b/makefile
index 8ea1d3da2c834e18521b92e089a92753e89042b0..190fbb49ea4fa37dfe29602922c5c0b8e4b6588a 100644 (file)
--- 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)))
@@ -35,19 +36,25 @@ inject :=
 filters := #E4X
 ldid := true
 entitle := $(ldid)
+lib := lib
 dll := so
-apr := -lapr-1
-library := 
+apr := $(shell apr-1-config --link-ld)
+library := $(apr)
 console := $(apr) -lreadline
 depends :=
 
 restart ?= $(MAKE)
 uname_s ?= $(shell uname -s)
 uname_p ?= $(shell uname -p)
+uname_m ?= $(shell uname -m)
 
 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk
 
+ifneq ($(shell pkg-config libffi --modversion 2>/dev/null),)
+flags += $(shell pkg-config --cflags libffi)
+endif
+
 ifdef CY_EXECUTE
 ifeq ($(filter ObjectiveC,$(filters)),)
 ifneq ($(shell which gnustep-config 2>/dev/null),)
@@ -57,38 +64,43 @@ endif
 endif
 
 flags += -Wall -Werror -Wno-parentheses #-Wno-unused
-flags += -fPIC -fno-common
+flags += -fno-common
 flags += -I. -Iinclude -I$(shell apr-1-config --includedir)
 
-all += libcycript.$(dll)
+all += $(lib)cycript.$(dll)
+
+filters += $(shell bison <(echo '%code{}%%_:') -o/dev/null 2>/dev/null && echo Bison24 || echo Bison23)
 
 ifdef arch
 deb := $(shell grep ^Package: control.in | cut -d ' ' -f 2-)_$(shell grep ^Version: control.in | cut -d ' ' -f 2 | sed -e 's/\#/$(svn)/')_$(arch).deb
 
-all: $(deb)
+all:
 
 extra::
 
 ifeq ($(depends)$(dll),dylib)
-control: control.in cycript libcycript.dylib
+control.tmp: control.in cycript $(lib)cycript.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
-       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)/' $< >$@
+control.tmp: control.in cycript $(lib)cycript.so
+       sed -e 's/&/'"$$(dpkg-query -S $$(ldd cycript $(lib)cycript.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
        cp -pR control package/DEBIAN
        mkdir -p package/usr/{bin,lib,sbin}
        $(restart) extra
-       cp -pR libcycript.$(dll) package/usr/lib
+       cp -pR $(lib)cycript.$(dll) package/usr/lib
        cp -pR cycript package/usr/bin
        #cp -pR cyrver package/usr/sbin
        dpkg-deb -b package $(deb)
@@ -97,15 +109,15 @@ 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 $(lib)cycript.$(dll) $(all) Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh cyrver Cycript.yy Cycript.l control Bridge.hpp
 
-%.y: %.y.in
+%.yy: %.yy.in
        ./Filter.sh <$< >$@ $(filters)
 
 %.l: %.l.in
        ./Filter.sh <$< >$@ $(filters)
 
-Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.y
+Cycript.tab.cc Cycript.tab.hh location.hh position.hh: Cycript.yy
        bison -v --report=state $<
 
 lex.cy.c: Cycript.l
@@ -115,30 +127,36 @@ 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)
+$(lib)cycript.$(dll): $(code)
+       $(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)
+cycript: Console.o $(lib)cycript.$(dll) $(inject)
+       $(target)$(gcc) $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(console) $(link)
        $(entitle) cycript
 
 package: $(deb)
 
 test: $(deb)
        dpkg -i $(deb)
-       cycript test.cy
+       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; 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
+
+install: cycript $(lib)cycript.$(dll)
+       cp -p cycript /usr/bin
+       cp -p $(lib)cycript.$(dll) /usr/lib
 
-.PHONY: all clean extra package control
+.PHONY: all clean extra package control.tmp