Support SO variable even when not Mach.

[cycript.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index c7c7adcb2e6695406b140ade1f227d76ea6ee8f8..fb3037c724bc418ec391f855ca7bf06774d8da03 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -18,6 +18,7 @@ objcxx := @OBJCXX@
 cflags := @CPPFLAGS@ @CXXFLAGS@ -DYYDEBUG=1 $(filter -DHAVE_FFI% -DHAVE_READLINE% -DHAVE_HISTORY_H,@DEFS@)
 objcxxflags := @OBJCXXFLAGS@
 ldflags := @LDFLAGS@
 cflags := @CPPFLAGS@ @CXXFLAGS@ -DYYDEBUG=1 $(filter -DHAVE_FFI% -DHAVE_READLINE% -DHAVE_HISTORY_H,@DEFS@)
 objcxxflags := @OBJCXXFLAGS@
 ldflags := @LDFLAGS@

+ltflags := @LTFLAGS@

 library := @LIBS@ @LTLIBAPR@ @LTLIBICONV@
 sed := @SED@
 bison := @BISON@
 library := @LIBS@ @LTLIBAPR@ @LTLIBICONV@
 sed := @SED@
 bison := @BISON@


@@ -75,8 +76,6 @@ endif
 paths := $(foreach path,$(paths),$(wildcard $(path)))
 cflags += $(foreach path,$(paths),-I$(path) -L$(path))
 
 paths := $(foreach path,$(paths),$(wildcard $(path)))
 cflags += $(foreach path,$(paths),-I$(path) -L$(path))
 

-#svn := $(shell svnversion $(srcdir))
-

 all:
 all := cycript
 
 all:
 all := cycript
 


@@ -85,7 +84,7 @@ all := cycript
 #arch := $(shell $(dpkg_architecture) -qDEB_HOST_ARCH 2>/dev/null)
 #endif
 
 #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
+header := Cycript.tab.hh Parser.hpp Pooling.hpp List.hpp Local.hpp cycript.hpp Internal.hpp Error.hpp String.hpp Exception.hpp Standard.hpp

 
 code := 
 code += Replace.lo Output.lo
 
 code := 
 code += Replace.lo Output.lo


@@ -97,10 +96,10 @@ inject :=
 
 filters := #E4X
 ldid := true
 
 filters := #E4X
 ldid := true

-entitle := $(ldid)
+entitle = $(ldid) -Scycript.xml

 lib := lib
 lib := lib

-dll := so
-depends :=
+dll := @SO@
+depends ?=

 
 restart ?= $(MAKE)
 uname_s ?= $(shell uname -s)
 
 restart ?= $(MAKE)
 uname_s ?= $(shell uname -s)


@@ -126,22 +125,20 @@ all += libcycript.la
 filters += $(shell $(bison) <(echo '%code{}%%_:') -o/dev/null 2>/dev/null && echo Bison24 || echo Bison23)
 
 ifdef arch
 filters += $(shell $(bison) <(echo '%code{}%%_:') -o/dev/null 2>/dev/null && echo Bison24 || echo Bison23)
 
 ifdef arch

-deb := $(shell grep ^Package: $(srcdir)/control.in | cut -d ' ' -f 2-)_$(shell grep ^Version: $(srcdir)/control.in | cut -d ' ' -f 2 | $(sed) -e 's/\#/$(svn)/')_$(arch).deb
+deb := $(shell grep ^Package: $(srcdir)/control.in | cut -d ' ' -f 2-)_$(shell grep ^Version: $(srcdir)/control.in | cut -d ' ' -f 2 | $(sed) -e 's/\#/$(version)/')_$(arch).deb

 
 all:
 
 
 all:
 

-extra::
-

 ifeq ($(depends)$(dll),dylib)
 ifeq ($(depends)$(dll),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)/' $< >$@
+control.tmp: control.in .libs/cycript .libs/$(lib)cycript.dylib
+       $(sed) -e 's/&/'"$$(dpkg-query -S $$(otool -lah .libs/cycript .libs/*.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/#/$(version)/;s/%/$(arch)/' $< >$@

 else
 ifeq ($(depends)$(dll),so)
 else
 ifeq ($(depends)$(dll),so)

-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)/' $< >$@
+control.tmp: control.in .libs/cycript .libs/$(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/#/$(version)/;s/%/$(arch)/' $< >$@

 else
 control.tmp: control.in
 else
 control.tmp: control.in

-       $(sed) -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(svn)/;s/%/$(arch)/' $< >$@
+       $(sed) -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(version)/;s/%/$(arch)/' $< >$@

 endif
 endif
 
 endif
 endif
 


@@ -152,11 +149,11 @@ $(deb): $(all) control
        rm -rf package
        mkdir -p package/DEBIAN
        cp -pR control package/DEBIAN
        rm -rf package
        mkdir -p package/DEBIAN
        cp -pR control package/DEBIAN

+       #sed -i -e '/^Depends: / s/\<mobilesubstrate\>/mobilesubstrate (>= 0.9.3072)/g' package/DEBIAN/control

        mkdir -p package/usr/{bin,lib,sbin}
        mkdir -p package/usr/{bin,lib,sbin}

-       $(restart) extra
-       cp -pR $(lib)cycript.$(dll) package/usr/lib
-       cp -pR cycript package/usr/bin
-       #cp -pR cyrver package/usr/sbin
+       cp -pR .libs/$(lib)cycript.0.$(dll) package/usr/lib
+       cp -pR .libs/$(lib)cycript.$(dll) package/usr/lib
+       cp -pR .libs/cycript package/usr/bin

        dpkg-deb -b package $(deb)
 endif
 
        dpkg-deb -b package $(deb)
 endif
 


@@ -180,20 +177,23 @@ Struct.hpp:
 
 ifeq ($(CY_OBJECTIVEC_MACH),1)
 code += Handler.lo
 
 ifeq ($(CY_OBJECTIVEC_MACH),1)
 code += Handler.lo

-cflags += -DCY_ATTACH -DCY_LIBRARY='"$(libdir)/libcycript.@SO@"'
+cflags += -DCY_ATTACH -DCY_LIBRARY='"$(libdir)/libcycript.$(dll)"'

 inject += Mach/Inject.lo
 
 Mach/Inject.lo: Trampoline.t.hpp Baton.hpp
 
 inject += Mach/Inject.lo
 
 Mach/Inject.lo: Trampoline.t.hpp Baton.hpp
 

-%.t.hpp: %.t.cpp trampoline.sh Baton.hpp Trampoline.hpp
-       $(srcdir)/trampoline.sh $@ .libs/$*.t.o $* $(sed) $(otool) $(lipo) $(nm) $(libtool) --mode=compile $(cxx) -c -fno-stack-protector -fno-exceptions -I$(srcdir)/include -o $*.t.lo $< $(cflags)
+%.t.lo: %.t.cpp Baton.hpp Trampoline.hpp
+       $(libtool) --mode=compile $(cxx) $(cflags) -c -o $@ $< -fno-stack-protector -fno-exceptions
+
+%.t.hpp: %.t.lo trampoline.sh
+       $(srcdir)/trampoline.sh $@ .libs/lib$*.t.$(dll) $* $(sed) $(otool) $(lipo) $(nm) $(libtool) --mode=link $(cxx) $(ldflags) -o lib$*.t.la $< -rpath $(libdir)

 endif
 endif
 
 all: $(all)
 
 clean::
 endif
 endif
 
 all: $(all)
 
 clean::

-       rm -rf *.lo *.o *.d *.t.hpp .libs */*.d */*.lo */.libs libcycript.la $(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.gperf Bridge.hpp Cycript.output
+       rm -rf *.lo *.o *.d *.t.hpp .libs */*.d */*.lo */.libs lib*.la $(all) Struct.hpp lex.cy.c Cycript.tab.cc Cycript.tab.hh location.hh position.hh stack.hh Cycript.yy Cycript.l control Bridge.gperf Bridge.hpp Cycript.output

 ifneq ($(srcdir),.)
        rm -rf Mach ObjectiveC sig
 endif
 ifneq ($(srcdir),.)
        rm -rf Mach ObjectiveC sig
 endif


@@ -229,12 +229,12 @@ lex.cy.lo: lex.cy.c $(header)
        $(libtool) --mode=compile $(objcxx) $(objcxxflags) $(cflags) -c -o $@ $<
 
 libcycript.la: $(code)
        $(libtool) --mode=compile $(objcxx) $(objcxxflags) $(cflags) -c -o $@ $<
 
 libcycript.la: $(code)

-       $(libtool) --mode=link $(cxx) $(ldflags) -o $@ $(filter %.lo,$^) $(library) $(link) -rpath $(libdir)
-       $(ldid) $@
+       $(libtool) --mode=link $(cxx) $(ltflags) $(ldflags) -o $@ $(filter %.lo,$^) $(library) $(link) -rpath $(libdir)
+       $(ldid) .libs/$(lib)cycript.$(dll)

 
 cycript: Console.lo libcycript.la $(inject)
 
 cycript: Console.lo libcycript.la $(inject)

-       $(libtool) --mode=link $(cxx) $(ldflags) -o $@ $(filter %.lo,$^) libcycript.la $(link) -rpath $(libdir)
-       $(entitle) cycript
+       $(libtool) --mode=link $(cxx) $(ltflags) $(ldflags) -o $@ $(filter %.lo,$^) libcycript.la $(link) -rpath $(libdir)
+       $(entitle) .libs/cycript

 
 package: $(deb)
 
 
 package: $(deb)
 


@@ -262,4 +262,4 @@ uninstall:
        $(libtool) --mode=uninstall rm -f $(DESTDIR)$(bindir)/cycript
        $(libtool) --mode=uninstall rm -f $(DESTDIR)$(libdir)/libcycript.la
 
        $(libtool) --mode=uninstall rm -f $(DESTDIR)$(bindir)/cycript
        $(libtool) --mode=uninstall rm -f $(DESTDIR)$(libdir)/libcycript.la
 

-.PHONY: all clean extra dist install uninstall package test control.tmp
+.PHONY: all clean dist install uninstall package test control.tmp