summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authorWilliam S Fulton <wsf@fultondesigns.co.uk>2015-08-20 06:16:01 +0100
committerWilliam S Fulton <wsf@fultondesigns.co.uk>2015-08-21 22:43:17 +0100
commit8e2bc595c67b57a2bd58661b08dc2d7585090e37 (patch)
tree49af8e4d6940f49d03de2c5450852cd4a219f384 /Makefile.in
parent4ef3507e8bcfde26ef0de11fa82b03068dbd01b2 (diff)
downloadswig-8e2bc595c67b57a2bd58661b08dc2d7585090e37.tar.gz
Remove use of preinst-swig script
Complete the prototype removal in ca1431. The script prevents SWIGTOOL=gdb from working as gdb can't be used to debug a shell script, it requires a binary. Add support for SWIGTOOL in all the examples. SWIG_LIB_DIR and SWIGEXE must now instead be set by all Makefiles. See issue #473.
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in8
1 files changed, 2 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in
index e8e08a994..85b965051 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -101,10 +101,6 @@ skip-errors = test -n ""
ACTION = check
NOSKIP =
-chk-set-swiglib = SWIG_LIB=@ROOT_DIR@/$(srcdir)/Lib
-chk-set-swig = SWIG=@ROOT_DIR@/$(TARGET)
-chk-set-env = $(chk-set-swiglib) $(chk-set-swig)
-
check-aliveness:
test -x ./$(TARGET)
./$(TARGET) -version
@@ -250,7 +246,7 @@ check-%-examples :
%.actionexample:
@cd Examples && $(MAKE) Makefile
@echo $(ACTION)ing Examples/$(LANGUAGE)/$*
- @(cd Examples/$(LANGUAGE)/$* && $(MAKE) $(FLAGS) $(chk-set-env) $(ACTION) RUNPIPE=$(RUNPIPE))
+ @(cd Examples/$(LANGUAGE)/$* && $(MAKE) $(FLAGS) $(ACTION) RUNPIPE=$(RUNPIPE))
# gcj individual example
java.actionexample:
@@ -259,7 +255,7 @@ java.actionexample:
echo "skipping Examples/$(LANGUAGE)/java $(ACTION) (gcj test)"; \
else \
echo $(ACTION)ing Examples/$(LANGUAGE)/java; \
- (cd Examples/$(LANGUAGE)/java && $(MAKE) $(FLAGS) $(chk-set-env) $(ACTION) RUNPIPE=$(RUNPIPE)) \
+ (cd Examples/$(LANGUAGE)/java && $(MAKE) $(FLAGS) $(ACTION) RUNPIPE=$(RUNPIPE)) \
fi
# Checks testcases in the test-suite excluding those which are known to be broken