summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorOliver Buchtala <oliver.buchtala@googlemail.com>2013-09-27 02:29:02 +0200
committerOliver Buchtala <oliver.buchtala@googlemail.com>2013-09-27 02:29:02 +0200
commit6dcbbf07db310a78457d1c00e84a60761502ea5d (patch)
tree3b4f7d6dd07719e4f9470c5ce5cb34fc6e261311 /Makefile.in
parent4492a3d76bddaee5b05dea31a0d281868f5581f7 (diff)
parentc2d3da2eeca2d1923d9c69dda70a8ce2f1b2cf1e (diff)
downloadswig-6dcbbf07db310a78457d1c00e84a60761502ea5d.tar.gz
Conflicts:
.gitignore .project .travis.yml Examples/Makefile.in Examples/test-suite/director_nspace.i
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in18
1 files changed, 13 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in
index 0ac8c88f9..323743d9f 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)
@@ -186,7 +188,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)
@@ -211,6 +214,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:=$(shell sed '/^\#/d' $(srcdir)/Examples/javascript/check.list)
# all examples
check-%-examples :
@@ -263,7 +267,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 \
@@ -315,7 +320,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
@@ -343,7 +349,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
@@ -456,7 +463,8 @@ 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 \
+ javascript/v8
lib-modules = std