fix partialcheck-test-suite and parallel make for r, chicken, tcl and php

git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@10560 626c5289-ae23-0410-ae9c-e8d60b6d4f22

Examples/Makefile.in

@@ -40,8 +40,9 @@ LIBCRYPT   = @LIBCRYPT@
 SYSLIBS    = $(LIBM) $(LIBC) $(LIBCRYPT)
 LIBPREFIX  =
 
-# RUNTOOL is for use as with runtime tools, eg set it to valgrind
+# RUNTOOL is for use with runtime tools, eg set it to valgrind
 RUNTOOL    =
+# COMPILETOOL is a way to run the compiler under another tool, or more commonly just to stop the compiler executing
 COMPILETOOL=
 
 # X11 options
@@ -94,8 +95,6 @@ TK_OPTS     = -ltk -ltcl @LIBS@
 
 # Extra Tcl specific dynamic linking options
 TCL_DLNK   = @TCLDYNAMICLINKING@
-TCL_LDSHARED = @TCL_LDSHARED@
-TCL_CXXSHARED = @TCL_CXXSHARED@
 TCL_SO     = @TCL_SO@
 
 # -----------------------------------------------------------
@@ -135,7 +134,7 @@ wish_cpp: $(SRCS)
 tcl:  $(SRCS)
 	$(SWIG) -tcl8 $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE)
 	$(CC) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(ISRCS) $(INCLUDES) $(TCL_INCLUDE)
-	$(TCL_LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO)
+	$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO)
 
 # -----------------------------------------------------------
 # Build a Tcl7.5 dynamic loadable module for C++
@@ -144,7 +143,7 @@ tcl:  $(SRCS)
 tcl_cpp: $(SRCS)
 	$(SWIG) -tcl8 -c++ $(SWIGOPT) $(TCL_SWIGOPTS) $(INTERFACE)
 	$(CXX) -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CXXSRCS) $(ICXXSRCS) $(INCLUDES) $(TCL_INCLUDE)
-	$(TCL_CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO)
+	$(CXXSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(TCL_DLNK) $(LIBS) $(CPP_DLLIBS) -o $(LIBPREFIX)$(TARGET)$(TCL_SO)
 
 # -----------------------------------------------------------------
 # Cleaning the Tcl examples
@@ -880,11 +879,11 @@ chicken_static_cpp: $(CXXSRCS) $(CHICKSRCS)
 
 chicken:
 	$(SWIG) -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE)
-	$(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ISRCS) -o $(TARGET)$(SO)
+	$(COMPILETOOL) $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ISRCS) -o $(TARGET)$(SO)
 
 chicken_cpp:
 	$(SWIG) -c++ -chicken $(SWIGOPT) $(INCLUDE) $(INTERFACE)
-	$(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ICXXSRCS) $(CXXSRCS) -o $(TARGET)$(SO)
+	$(COMPILETOOL) $(CHICKEN_CSC) -s `echo $(INCLUDES) | sed 's/-I/-C -I/g'` $(CHICKEN_GENERATED_SCHEME) $(SRCS) $(ICXXSRCS) $(CXXSRCS) -o $(TARGET)$(SO)
 
 chicken_externalhdr:
 	$(SWIG) -chicken -external-runtime $(TARGET)
@@ -1078,11 +1077,11 @@ RRSRC = $(INTERFACE:.i=.R)
 
 r: $(SRCS)
 	$(SWIG) -r $(SWIGOPT) $(INTERFACE)
-	+( PKG_LIBS="$(SRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(ISRCS) )
+	+( PKG_LIBS="$(SRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(ISRCS) )
 
 r_cpp: $(CXXSRCS)
 	$(SWIG) -c++ -r $(SWIGOPT) -o $(RCXXSRCS) $(INTERFACE)
-	+( PKG_LIBS="$(CXXSRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) )
+	+( PKG_LIBS="$(CXXSRCS)" PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) )
 
 r_clean:
 	rm -f *_wrap* *~ .~*

Examples/test-suite/chicken/Makefile.in

@@ -40,7 +40,7 @@ SWIGOPT += -nounit
 	$(setup)
 	+$(swig_and_compile_c)
 	$(run_testcase)
-	+if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(PROXYSUFFIX) ]; then ( \
+	if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(PROXYSUFFIX) ]; then ( \
 	  $(MAKE) $*.cproxy; ) \
 	fi;
 
@@ -54,7 +54,7 @@ SWIGOPT += -nounit
 
 %.externaltest:
 	$(setup)
-	$(swig_and_compile_external)
+	+$(swig_and_compile_external)
 	$(run_testcase)
 
 # Runs the testcase. A testcase is only run if
@@ -70,7 +70,7 @@ run_testcase = \
 %.cppproxy: SCRIPTSUFFIX = $(PROXYSUFFIX)
 %.cppproxy:
 	echo "Checking testcase $* (with run test) under chicken with -proxy"
-	$(swig_and_compile_cpp)
+	+$(swig_and_compile_cpp)
 	$(run_testcase)
 
 %.cproxy: SWIGOPT += -proxy

Examples/test-suite/php4/Makefile.in

@@ -42,17 +42,17 @@ missingtests: missingcpptests missingctests
 %.cpptest: 
 	$(setup)
 	+$(swig_and_compile_cpp)
-	$(run_testcase)
+	+$(run_testcase)
 
 %.ctest:
 	$(setup)
 	+$(swig_and_compile_c)
-	$(run_testcase)
+	+$(run_testcase)
 
 %.multicpptest: 
 	$(setup)
 	+$(swig_and_compile_multi_cpp)
-	$(run_testcase)
+	+$(run_testcase)
 
 # Runs the testcase. A testcase is only run if
 # a file is found which has _runme.php4 appended after the testcase name.

Examples/test-suite/r/Makefile.in

@@ -42,7 +42,7 @@ run_testcase = \
 	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=.:"$$PATH" \
                $(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ;) \
 	else \
-	  ($(RUNR) $(srcdir)/$(SCRIPTPREFIX)$*$(WRAPSUFFIX);) \
+	  ($(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$*$(WRAPSUFFIX);) \
 	fi;
 
 run_multitestcase = \
@@ -51,7 +51,7 @@ run_multitestcase = \
 	  env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=.:"$$PATH" \
                $(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(SCRIPTSUFFIX) ;) \
 	else \
-	  ($(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(WRAPSUFFIX);) \
+	  ($(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(WRAPSUFFIX);) \
 	fi; \
 	done
 # Clean

configure.in

@@ -254,18 +254,6 @@ case $host in
    *) MZSCHEME_SO=.so;;
 esac
 
-AC_SUBST(TCL_LDSHARED)
-case $host in
-   *-*-darwin*) TCL_LDSHARED="gcc -dynamiclib -flat_namespace -undefined suppress";;
-   *) TCL_LDSHARED=$LDSHARED;;
-esac
-
-AC_SUBST(TCL_CXXSHARED)
-case $host in
-   *-*-darwin*) TCL_CXXSHARED="g++ -dynamiclib -flat_namespace -undefined suppress";;
-   *) TCL_CXXSHARED=$TRYLINKINGWITHCXX;;
-esac
-
 AC_SUBST(LUA_SO)
 case $host in
    *-*-darwin*) LUA_SO=.so;;
@@ -545,6 +533,7 @@ fi
 # Cygwin (Windows) needs the library for dynamic linking
 case $host in
 *-*-cygwin* | *-*-mingw*) TCLDYNAMICLINKING="$TCLLIB";;
+*-*-darwin*) TCLDYNAMICLINKING="-dynamiclib -flat_namespace -undefined suppress";;
 *)TCLDYNAMICLINKING="";;
 esac
 fi