Changed from a threaded pool to a thread-local pool, abstracted out token assignment...

[cycript.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index b193e8f53898687fdc711842dfbf534fa3de589a..a99274702f3e41c42f54e1182ed1a1d1e021a97c 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -23,7 +23,9 @@ sed := @SED@
 bison := @BISON@
 time := @TIME@
 gperf := @GPERF@
 bison := @BISON@
 time := @TIME@
 gperf := @GPERF@

-otool := @OTOOL@
+otool := @_OTOOL@
+lipo := @_LIPO@
+nm := @_NM@

 
 INSTALL := @INSTALL@
 INSTALL_PROGRAM := @INSTALL_PROGRAM@
 
 INSTALL := @INSTALL@
 INSTALL_PROGRAM := @INSTALL_PROGRAM@


@@ -55,6 +57,7 @@ mandir := @mandir@
 CY_EXECUTE := @CY_EXECUTE@
 CY_OBJECTIVEC := @CY_OBJECTIVEC@
 CY_OBJECTIVEC_MACH := @CY_OBJECTIVEC_MACH@
 CY_EXECUTE := @CY_EXECUTE@
 CY_OBJECTIVEC := @CY_OBJECTIVEC@
 CY_OBJECTIVEC_MACH := @CY_OBJECTIVEC_MACH@

+CY_ATTACH_GROUP := @CY_ATTACH_GROUP@

 
 svn := @SVN@
 svnversion := @SVNVERSION@
 
 svn := @SVN@
 svnversion := @SVNVERSION@


@@ -82,7 +85,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 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


@@ -96,7 +99,7 @@ filters := #E4X
 ldid := true
 entitle := $(ldid)
 lib := lib
 ldid := true
 entitle := $(ldid)
 lib := lib

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

 depends :=
 
 restart ?= $(MAKE)
 depends :=
 
 restart ?= $(MAKE)


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

-cflags += -DCY_ATTACH
+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
-       # LC_SEGMENT_64
-       $(libtool) --mode=compile $(cxx) -c -fno-stack-protector -fno-exceptions -I$(srcdir)/include -o $*.t.lo $< $(cflags) && { file=($$($(otool) -l .libs/$*.t.o | $(sed) -e 'x; /^1/ { x; /^ *filesize / { s/^.* //; p; }; /^ *fileoff / { s/^.* //; p; }; x; }; x; /^ *cmd LC_SEGMENT/ { s/.*/1/; x; }; d;')); od -t x1 -j $${file[0]} -N $${file[1]} .libs/$*.t.o | $(sed) -e 's/^[^ ]*//' | tr $$'\n' ' ' | $(sed) -e 's/  */ /g;s/^ *//;s/ $$//;s/ /,/g;s/\([^,][^,]\)/0x\1/g' | $(sed) -e 's/^/static const char $*_[] = {/;s/$$/};/' && echo && echo "/*" && $(otool) -vVt .libs/$*.t.o && echo "*/"; } >$@ && rm -f $*.t.lo .libs/$*.t.o
+%.t.hpp: %.t.cpp trampoline.sh Baton.hpp Trampoline.hpp
+       $(srcdir)/trampoline.sh $@ .libs/lib$*.t.$(dll) $* $(sed) $(otool) $(lipo) $(nm) $(libtool) --mode=link $(cxx) -c -fno-stack-protector -fno-exceptions -I$(srcdir)/include -o lib$*.t.la $< $(cflags) -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 cyrver 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


@@ -251,6 +253,10 @@ install: cycript libcycript.la
        $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
        $(libtool) --mode=install $(INSTALL_PROGRAM) libcycript.la $(DESTDIR)$(libdir)/libcycript.la
        $(libtool) --mode=install $(INSTALL_PROGRAM) cycript $(DESTDIR)$(bindir)/cycript
        $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
        $(libtool) --mode=install $(INSTALL_PROGRAM) libcycript.la $(DESTDIR)$(libdir)/libcycript.la
        $(libtool) --mode=install $(INSTALL_PROGRAM) cycript $(DESTDIR)$(bindir)/cycript

+ifneq ($(CY_ATTACH_GROUP),)
+       chgrp $(CY_ATTACH_GROUP) $(DESTDIR)$(bindir)/cycript
+       chmod g+s $(DESTDIR)$(bindir)/cycript
+endif

 
 uninstall:
        $(libtool) --mode=uninstall rm -f $(DESTDIR)$(bindir)/cycript
 
 uninstall:
        $(libtool) --mode=uninstall rm -f $(DESTDIR)$(bindir)/cycript