Got true JS booleans working in GNUstep.

[cycript.git] / makefile

diff --git a/makefile b/makefile
index 1e5d57a6f1e6202c0d656147282edba34469c1c3..4240e51a136e377df3d6c4c5cd5b8c125bb85b3a 100644 (file)
--- a/makefile
+++ b/makefile
@@ -6,7 +6,10 @@ else
 target := $(PKG_TARG)-
 endif
 
-flags :=
+flags ?= -g3 -O0 -DYYDEBUG=1
+
+paths := $(foreach path,$(paths),$(wildcard $(path)))
+flags += $(foreach path,$(paths),-I$(path) -L$(path))
 objc :=
 
 svn := $(shell svnversion)
@@ -19,23 +22,28 @@ ifneq ($(dpkg_architecture),)
 arch := $(shell $(dpkg_architecture) -qDEB_HOST_ARCH 2>/dev/null)
 endif
 
-header := Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp
+header := Cycript.tab.hh Parser.hpp Pooling.hpp cycript.hpp Internal.hpp Error.hpp String.hpp Exception.hpp Standard.hpp
 code := sig/ffi_type.o sig/parse.o sig/copy.o
 code += Replace.o Output.o
 code += Cycript.tab.o lex.cy.o
 code += Network.o Parser.o
 code += JavaScriptCore.o Library.o
 
+inject := 
+
 filters := C #E4X
 ldid := true
+entitle := $(ldid)
 dll := so
-apr := $(shell apr-1-config --link-ld)
-library := $(apr) -lffi -liconv -lsqlite3
+apr := -lapr-1
+library := $(apr) -lffi -lsqlite3
 console := $(apr) -lreadline
 depends :=
 
-uname_s := $(shell uname -s)
-uname_p := $(shell uname -p)
+restart ?= $(MAKE)
+uname_s ?= $(shell uname -s)
+uname_p ?= $(shell uname -p)
+
 -include $(uname_s).mk
 -include $(uname_s)-$(uname_p).mk
 
@@ -45,38 +53,49 @@ include GNUstep.mk
 endif
 endif
 
-#flags += -g3 -O0 -DYYDEBUG=1
-flags += -g0 -O3
 flags += -Wall -Werror -Wno-parentheses #-Wno-unused
 flags += -fPIC -fno-common
-flags += -I. -I$(shell apr-1-config --includedir)
+flags += -I. -Iinclude -I$(shell apr-1-config --includedir)
 
 all += libcycript.$(dll)
 
 ifdef arch
-deb := $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2 | sed -e 's/\#/$(svn)/')_$(arch).deb
+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)
 
 extra:
 
-$(deb): $(all)
+ifeq ($(depends)$(dll),dylib)
+control: 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
+       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
+       sed -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(svn)/;s/%/$(arch)/' $< >$@
+endif
+endif
+
+$(deb): $(all) control
        rm -rf package
        mkdir -p package/DEBIAN
-       sed -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(svn)/;s/%/$(arch)/' control >package/DEBIAN/control
-       $(MAKE) extra
+       cp -pR control package/DEBIAN
+       $(restart) extra
        mkdir -p package/usr/{bin,lib,sbin}
-       cp -a libcycript.$(dll) package/usr/lib
-       cp -a cycript package/usr/bin
-       #cp -a cyrver package/usr/sbin
-       cp -a libcycript.db package/usr/lib
+       cp -pR libcycript.$(dll) package/usr/lib
+       cp -pR cycript package/usr/bin
+       #cp -pR cyrver package/usr/sbin
+       cp -pR libcycript.db package/usr/lib
        dpkg-deb -b package $(deb)
 endif
 
 all: $(all)
 
 clean:
-       rm -f *.o libcycript.$(dll) cycript libcycript.db Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh cyrver Cycript.y
+       rm -f *.o libcycript.$(dll) cycript libcycript.db Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh cyrver Cycript.y Cycript.l control
 
 libcycript.db: Bridge.def
        rm -f libcycript.db
@@ -119,9 +138,9 @@ libcycript.$(dll): $(code)
        $(target)g++ $(flags) -shared -dynamiclib -o $@ $(filter %.o,$^) $(library) $(link)
        $(ldid) $@
 
-cycript: Console.o libcycript.$(dll)
+cycript: Console.o libcycript.$(dll) $(inject)
        $(target)g++ $(flags) -o $@ $(filter %.o,$^) -L. -lcycript $(console) $(link)
-       $(ldid) cycript
+       $(entitle) cycript
 
 package: $(deb)