diff options
| author | Oliver Buchtala <oliver.buchtala@googlemail.com> | 2012-09-08 00:56:48 +0000 |
|---|---|---|
| committer | Oliver Buchtala <oliver.buchtala@googlemail.com> | 2012-09-08 00:56:48 +0000 |
| commit | 050219d998c0a518b54366c6c543fa926e601e5b (patch) | |
| tree | a199f8711e72e8120ce62fbb02a30c07c87128b5 /Makefile.in | |
| parent | 360ef44e09e9072702215c46306731ccbbbc1d03 (diff) | |
| download | swig-050219d998c0a518b54366c6c543fa926e601e5b.tar.gz | |
Merge branch 'devel' of https://github.com/Neha03/gsoc2012-javascript into devel
Conflicts:
.project
COPYRIGHT
Doc/Manual/style.css
Examples/Makefile.in
Examples/test-suite/common.mk
Lib/typemaps/strings.swg
Makefile.in
Source/DOH/fio.c
Source/Makefile.am
Source/Modules/emit.cxx
Source/Modules/javascript.cxx
configure.in
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/branches/oliverb-javascript-v8@13764 626c5289-ae23-0410-ae9c-e8d60b6d4f22
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 644275773..adc971455 100644 --- a/Makefile.in +++ b/Makefile.in @@ -77,6 +77,7 @@ skip-uffi = test -n "@SKIP_UFFI@" skip-r = test -n "@SKIP_R@" skip-go = test -n "@SKIP_GO@" skip-d = test -n "@SKIP_D@" +skip-javascript = test -n "@SKIP_JAVASCRIPT@" # Additional dependencies for some tests skip-gcj = test -n "@SKIP_GCJ@" @@ -119,6 +120,7 @@ check-aliveness: @$(skip-r) || ./$(TARGET) -r -help @$(skip-go) || ./$(TARGET) -go -help @$(skip-d) || ./$(TARGET) -d -help + @$(skip-javascript)|| ./$(TARGET) -d -help check-ccache: test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) check) @@ -147,7 +149,8 @@ check-examples: \ check-cffi-examples \ check-r-examples \ check-go-examples \ - check-d-examples + check-d-examples \ + check-javascript-examples tcl_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/tcl/check.list) perl5_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/perl5/check.list) @@ -172,6 +175,7 @@ cffi_examples := r_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/r/check.list) go_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/go/check.list) d_examples :=$(shell sed '/^\#/d' $(srcdir)/Examples/d/check.list) +javascript_examples:= # all examples check-%-examples : @@ -225,7 +229,8 @@ check-test-suite: \ check-chicken-test-suite \ check-r-test-suite \ check-go-test-suite \ - check-d-test-suite + check-d-test-suite \ + check-javascript-test-suite check-%-test-suite: @if test -z "$(skip-$*)"; then \ @@ -278,7 +283,8 @@ all-test-suite: \ all-chicken-test-suite \ all-r-test-suite \ all-go-test-suite \ - all-d-test-suite + all-d-test-suite \ + all-javascript-test-suite all-%-test-suite: @$(MAKE) -k -s check-$*-test-suite ACTION=all @@ -307,7 +313,8 @@ broken-test-suite: \ broken-chicken-test-suite \ broken-r-test-suite \ broken-go-test-suite \ - broken-d-test-suite + broken-d-test-suite \ + broken-javascript-test-suite broken-%-test-suite: @$(MAKE) -k -s check-$*-test-suite ACTION=broken @@ -424,7 +431,7 @@ install-main: @$(INSTALL_PROGRAM) $(TARGET) $(DESTDIR)$(BIN_DIR)/`echo $(TARGET_NOEXE) | sed '$(transform)'`@EXEEXT@ lib-languages = gcj typemaps tcl perl5 python guile java mzscheme ruby php ocaml octave \ - pike chicken csharp modula3 allegrocl clisp lua cffi uffi r go d + pike chicken csharp modula3 allegrocl clisp lua cffi uffi r go d javascript javascript/jsc lib-modules = std |