diff options
author | Oliver Buchtala <oliver.buchtala@googlemail.com> | 2014-03-05 01:09:26 +0100 |
---|---|---|
committer | Oliver Buchtala <oliver.buchtala@googlemail.com> | 2014-03-05 01:09:26 +0100 |
commit | a234542543088140e4dd925b0060a93960db9eee (patch) | |
tree | 952d2818d50027d150b5388dc121e99ef95316e5 /Makefile.in | |
parent | 8c05fe37afcbcd6a2fc2a7d8bbe028e6d8f59239 (diff) | |
parent | c99417ab136ed643c437065c88368b67b4e77fa3 (diff) | |
download | swig-a234542543088140e4dd925b0060a93960db9eee.tar.gz |
Merge branch 'master' into tmp
Conflicts:
.travis.yml
Examples/Makefile.in
Examples/test-suite/director_nspace.i
Examples/test-suite/nspace.i
Examples/test-suite/nspace_extend.i
Source/Modules/lang.cxx
configure.ac
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 74 |
1 files changed, 43 insertions, 31 deletions
diff --git a/Makefile.in b/Makefile.in index 323743d9f..f4d0be077 100644 --- a/Makefile.in +++ b/Makefile.in @@ -9,9 +9,16 @@ exec_prefix = @exec_prefix@ srcdir = @srcdir@ datarootdir = @datarootdir@ -############################################################################## +##################################################################### +# Make options - override these to see more output +##################################################################### + +RUNPIPE = \>/dev/null +FLAGS = -k -s + +##################################################################### # Compiler and system configuration -############################################################################## +##################################################################### SHELL = /bin/sh SWIG_LIB = @swig_lib@ @@ -22,7 +29,7 @@ TARGET = $(TARGET_NOEXE)@EXEEXT@ SOURCE = Source CCACHE = CCache DOCS = Doc/Manual -RUNPIPE = \>/dev/null +HAVE_CXX11_COMPILER = @HAVE_CXX11_COMPILER@ swig: libfiles source ccache @@ -83,6 +90,9 @@ skip-javascript = test -n "@SKIP_JAVASCRIPT@" skip-gcj = test -n "@SKIP_GCJ@" skip-android = test -n "@SKIP_ANDROID@" +# Special errors test-case +skip-errors = test -n "" + ##################################################################### # CHECK ##################################################################### @@ -120,7 +130,7 @@ check-aliveness: @$(skip-r) || ./$(TARGET) -r -help @$(skip-go) || ./$(TARGET) -go -help @$(skip-d) || ./$(TARGET) -d -help - @$(skip-javascript)|| ./$(TARGET) -d -help + @$(skip-javascript) || ./$(TARGET) -javascript -help check-ccache: test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) check) @@ -131,6 +141,7 @@ check-versions: \ check-perl5-version \ check-python-version \ check-java-version \ + check-javascript-version \ check-android-version \ check-guile-version \ check-mzscheme-version \ @@ -161,7 +172,7 @@ check-%-version : echo skipping $* version; \ else \ echo showing $* version; \ - (cd Examples && $(MAKE) -s $*_version) \ + (cd Examples && $(MAKE) $(FLAGS) $*_version) \ fi # Checks examples for compilation (does not run them) @@ -227,13 +238,13 @@ check-%-examples : elif test -z "$($(strip $*_examples))"; then \ echo empty $* $(ACTION); \ else \ - $(MAKE) -k -s $($*_examples:=.actionexample) LANGUAGE=$* ACTION=$(ACTION); \ + $(MAKE) $(FLAGS) $($*_examples:=.actionexample) LANGUAGE=$* ACTION=$(ACTION); \ fi # individual example %.actionexample: @echo $(ACTION)ing Examples/$(LANGUAGE)/$* - @(cd Examples/$(LANGUAGE)/$* && $(MAKE) -s $(chk-set-env) $(ACTION) RUNPIPE=$(RUNPIPE)) + @(cd Examples/$(LANGUAGE)/$* && $(MAKE) $(FLAGS) $(chk-set-env) $(ACTION) RUNPIPE=$(RUNPIPE)) # gcj individual example java.actionexample: @@ -241,11 +252,12 @@ java.actionexample: echo "skipping Examples/$(LANGUAGE)/java $(ACTION) (gcj test)"; \ else \ echo $(ACTION)ing Examples/$(LANGUAGE)/java; \ - (cd Examples/$(LANGUAGE)/java && $(MAKE) -s $(chk-set-env) $(ACTION)) \ + (cd Examples/$(LANGUAGE)/java && $(MAKE) $(FLAGS) $(chk-set-env) $(ACTION)) \ fi # Checks testcases in the test-suite excluding those which are known to be broken check-test-suite: \ + check-errors-test-suite \ check-tcl-test-suite \ check-perl5-test-suite \ check-python-test-suite \ @@ -283,17 +295,17 @@ check-%-test-suite: echo warning: cannot $(ACTION) $* test-suite "(no dir $$dir)";\ else \ echo $(ACTION)ing $* test-suite; \ - (cd $$dir && $(MAKE) -k -s $(ACTION)) \ + (cd $$dir && $(MAKE) $(FLAGS) $(ACTION) HAVE_CXX11_COMPILER=$(HAVE_CXX11_COMPILER)) \ || passed=false; \ fi; \ test $$passed = true # Partial test-suite check - it only invokes SWIG, ie no compilation and no runtime testing partialcheck-test-suite: - @$(MAKE) -k -s check-test-suite ACTION=partialcheck NOSKIP=1 + @$(MAKE) $(FLAGS) check-test-suite ACTION=partialcheck NOSKIP=1 partialcheck-%-test-suite: - @$(MAKE) -k -s check-$*-test-suite ACTION=partialcheck NOSKIP=1 + @$(MAKE) $(FLAGS) check-$*-test-suite ACTION=partialcheck NOSKIP=1 check: check-aliveness check-ccache check-versions check-examples check-test-suite @@ -324,7 +336,7 @@ all-test-suite: \ all-javascript-test-suite all-%-test-suite: - @$(MAKE) -k -s check-$*-test-suite ACTION=all + @$(MAKE) $(FLAGS) check-$*-test-suite ACTION=all # Run known-to-be-broken testcases in the test-suite broken-test-suite: \ @@ -353,7 +365,7 @@ broken-test-suite: \ broken-javascript-test-suite broken-%-test-suite: - @$(MAKE) -k -s check-$*-test-suite ACTION=broken + @$(MAKE) $(FLAGS) check-$*-test-suite ACTION=broken ##################################################################### # CLEAN @@ -365,29 +377,29 @@ clean-objects: clean-source clean-ccache clean-source: @echo cleaning Source - @cd $(SOURCE) && $(MAKE) -s clean + @cd $(SOURCE) && $(MAKE) $(FLAGS) clean @rm -f $(TARGET) clean-examples: - @$(MAKE) -k -s check-examples ACTION=clean + @$(MAKE) $(FLAGS) check-examples ACTION=clean clean-test-suite: - @$(MAKE) -k -s check-test-suite ACTION=clean NOSKIP=1 + @$(MAKE) $(FLAGS) check-test-suite ACTION=clean NOSKIP=1 clean-%-examples: - @$(MAKE) -k -s check-$*-examples ACTION=clean + @$(MAKE) $(FLAGS) check-$*-examples ACTION=clean clean-%-test-suite: - @$(MAKE) -k -s check-$*-test-suite ACTION=clean NOSKIP=1 + @$(MAKE) $(FLAGS) check-$*-test-suite ACTION=clean NOSKIP=1 clean-ccache: - test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) -s clean) + test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) $(FLAGS) clean) ##################################################################### # DISTCLEAN - clean what configure built ##################################################################### -DISTCLEAN-DEAD = config.status config.log config.cache swig.spec Makefile mkmf.log libtool preinst-swig Lib/ocaml/swigp4.ml +DISTCLEAN-DEAD = config.status config.log config.cache swig.spec Makefile mkmf.log libtool preinst-swig distclean-helper: distclean-test-suite distclean-examples distclean-dead @@ -395,20 +407,20 @@ distclean: distclean-source distclean-ccache distclean-helper distclean-source: @echo distcleaning Source - @cd $(SOURCE) && $(MAKE) -s distclean + @cd $(SOURCE) && $(MAKE) $(FLAGS) distclean @rm -f $(TARGET) distclean-test-suite: @echo distcleaning Examples/test-suite - @$(MAKE) -k -s check-test-suite ACTION=distclean NOSKIP=1 + @$(MAKE) $(FLAGS) check-test-suite ACTION=distclean NOSKIP=1 distclean-examples: @echo distcleaning Examples - @$(MAKE) -k -s clean-examples - @cd Examples && $(MAKE) -k -s distclean + @$(MAKE) $(FLAGS) clean-examples + @cd Examples && $(MAKE) $(FLAGS) distclean distclean-ccache: - @test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) -s distclean) + @test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) $(FLAGS) distclean) distclean-dead: rm -f $(DISTCLEAN-DEAD) @@ -422,15 +434,15 @@ distclean-dead: maintainer-clean: @echo maintainer-cleaning source - @cd $(SOURCE) && $(MAKE) -k -s maintainer-clean + @cd $(SOURCE) && $(MAKE) $(FLAGS) maintainer-clean @echo maintainer-cleaning CCache - @test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) -s maintainer-clean) + @test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) $(FLAGS) maintainer-clean) @echo maintainer-cleaning docs - @cd $(DOCS) && $(MAKE) -k -s maintainer-clean + @cd $(DOCS) && $(MAKE) $(FLAGS) maintainer-clean @echo maintainer-cleaning Lib files @rm -f $(srcdir)/Lib/swigwarn.swg @echo distcleaning - @$(MAKE) -k -s distclean-helper + @$(MAKE) $(FLAGS) distclean-helper ##################################################################### # Update the Lib/swigwarn.swg file @@ -440,7 +452,7 @@ maintainer-clean: $(srcdir)/Lib/swigwarn.swg: $(srcdir)/Source/Include/swigwarn.h mkdir -p Lib echo "/* SWIG warning codes */" > $@ - cat $? | grep "^#define WARN\|/\*.*\*/\|^[ \t]*$$" | sed 's/^#define \(WARN.*[0-9]\+\)\(.*\)$$/%define SWIG\1 %enddef\2/' >> $@ + cat $? | grep "^#define WARN\|/\*.*\*/\|^[ \t]*$$" | sed 's/^#define \(WARN.*[0-9][0-9]*\)\(.*\)$$/%define SWIG\1 %enddef\2/' >> $@ ##################################################################### # TARGETS: install & friends @@ -499,7 +511,7 @@ install-lib: done install-ccache: - @test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) -s install) + @test -z "$(ENABLE_CCACHE)" || (cd $(CCACHE) && $(MAKE) install) ##################################################################### |