Implement (modified) ECMA6 array comprehensions.

[cycript.git] / GNUmakefile.in

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 01a0f0eb7d8fd46170641b687d45e55874d18ea3..770f3848b39ebc43020addb924bd6eb82a148bd2 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -60,17 +60,12 @@ CY_OBJECTIVEC := @CY_OBJECTIVEC@
 CY_OBJECTIVEC_MACH := @CY_OBJECTIVEC_MACH@
 CY_ATTACH_GROUP := @CY_ATTACH_GROUP@
 
-svn := @SVN@
-svnversion := @SVNVERSION@
+git := @GIT@
 
-ifneq ($(svnversion),)
-release := $(shell svnversion $(srcdir))
-
-ifneq ($(release),exported)
-gnutar := @GNUTAR@
-version := @PACKAGE_VERSION@.$(release)
-tarname := @PACKAGE_TARNAME@-$(version)
-endif
+ifneq ($(git),)
+version := $(shell $(git) describe --always --tags --dirty="+" --match="v*" | $(sed) -e 's@-\([^-]*\)-\([^-]*\)$$@+\1.\2@;s@^v@@')
+else
+version := @PACKAGE_VERSION@
 endif
 
 paths := $(foreach path,$(paths),$(wildcard $(path)))
@@ -138,7 +133,7 @@ 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
-       $(sed) -e 's/&/$(foreach depend,$(depends),$(depend),)/;s/,$$//;s/#/$(version)/;s/%/$(arch)/' $< >$@
+       $(sed) -e 's/&/$(depends)/;s/,$$//;s/#/$(version)/;s/%/$(arch)/' $< >$@
 endif
 endif
 
@@ -183,7 +178,7 @@ inject += Mach/Inject.lo
 Mach/Inject.lo: Trampoline.t.hpp Baton.hpp
 
 %.t.lo: %.t.cpp Baton.hpp Trampoline.hpp
-       $(libtool) --mode=compile $(cxx) $(cflags) -c -o $@ $< -fno-stack-protector -fno-exceptions
+       $(libtool) --mode=compile $(cxx) $(cflags) -c -o $@ $< -fno-stack-protector -fno-exceptions -O0
 
 %.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) -Xcompiler -nostdlib
@@ -243,12 +238,6 @@ test: cycript
        if [[ -e jquery.js ]]; then $(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
 
-ifneq ($(gnutar),:)
-dist:
-       echo -n >> $(tarname).tar.gz
-       $(gnutar) -cC $(srcdir) -f $(tarname).tar.gz -vX <($(svn) propget svn:ignore $(srcdir)) -z --exclude-vcs --show-transformed-names --transform='s#^\.#$(tarname)#' .
-endif
-
 install: cycript libcycript.la
        $(INSTALL) -d $(DESTDIR)$(bindir) $(DESTDIR)$(libdir)
        $(libtool) --mode=install $(INSTALL_PROGRAM) libcycript.la $(DESTDIR)$(libdir)/libcycript.la