Whitespace cleanup of all Makefiles*

- some of the %.clean rules in the test-suite Makefiles were using a single tab
  as an empty rule, dangerous! I've replaced these with the safer '@exit 0'.
This commit is contained in:
Karl Wette 2014-05-02 16:16:11 +02:00
commit d5b765d388
33 changed files with 138 additions and 167 deletions

View file

@ -69,9 +69,9 @@ distclean: clean
maintainer-clean: distclean maintainer-clean: distclean
/bin/rm -f $(PACKAGE_NAME).1 web/ccache-man.html /bin/rm -f $(PACKAGE_NAME).1 web/ccache-man.html
# FIXME: To fix this, test.sh needs to be able to take ccache from the # FIXME: To fix this, test.sh needs to be able to take ccache from the
# installed prefix, not from the source dir. # installed prefix, not from the source dir.
installcheck: installcheck:
@echo "WARNING! This is not really \"installcheck\" yet." @echo "WARNING! This is not really \"installcheck\" yet."
$(MAKE) check $(MAKE) check

View file

@ -75,4 +75,3 @@ linkchecker:
@echo Note linkchecker versions prior to 6.1 do not work properly wrt anchors @echo Note linkchecker versions prior to 6.1 do not work properly wrt anchors
@echo ----------------------------------------------------------------------- @echo -----------------------------------------------------------------------
linkchecker --config=./linkchecker.config index.html linkchecker --config=./linkchecker.config index.html

View file

@ -88,7 +88,7 @@ endif
################################################################## ##################################################################
CPP_DLLIBS = #-L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \ CPP_DLLIBS = #-L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \
-L/usr/local/lib -lg++ -lstdc++ -lgcc -L/usr/local/lib -lg++ -lstdc++ -lgcc
# Solaris workshop 5.0 # Solaris workshop 5.0
# CPP_DLLIBS = -L/opt/SUNWspro/lib -lCrun # CPP_DLLIBS = -L/opt/SUNWspro/lib -lCrun
@ -1621,7 +1621,7 @@ R_SCRIPT=$(RUNME).R
r: $(SRCS) r: $(SRCS)
$(SWIG) -r $(SWIGOPT) $(INTERFACEPATH) $(SWIG) -r $(SWIGOPT) $(INTERFACEPATH)
ifneq ($(SRCS),) ifneq ($(SRCS),)
$(CC) -g -c $(CFLAGS) $(R_CFLAGS) $(SRCS) $(INCLUDES) $(CC) -g -c $(CFLAGS) $(R_CFLAGS) $(SRCS) $(INCLUDES)
endif endif
+( PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(ISRCS) $(OBJS) > /dev/null ) +( PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(ISRCS) $(OBJS) > /dev/null )
@ -1632,7 +1632,7 @@ endif
r_cpp: $(CXXSRCS) r_cpp: $(CXXSRCS)
$(SWIG) -c++ -r $(SWIGOPT) -o $(RCXXSRCS) $(INTERFACEPATH) $(SWIG) -c++ -r $(SWIGOPT) -o $(RCXXSRCS) $(INTERFACEPATH)
ifneq ($(CXXSRCS),) ifneq ($(CXXSRCS),)
$(CXX) -g -c $(CXXFLAGS) $(R_CFLAGS) $(CXXSRCS) $(INCLUDES) $(CXX) -g -c $(CXXFLAGS) $(R_CFLAGS) $(CXXSRCS) $(INCLUDES)
endif endif
+( PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) $(OBJS) > /dev/null ) +( PKG_CPPFLAGS="$(INCLUDES)" $(COMPILETOOL) $(R) CMD SHLIB -o $(LIBPREFIX)$(TARGET)$(SO) $(RCXXSRCS) $(OBJS) > /dev/null )

View file

@ -12,7 +12,7 @@ top_builddir = @top_builddir@
# these cpp tests generate warnings/errors when compiling # these cpp tests generate warnings/errors when compiling
# the wrapper .cxx file. # the wrapper .cxx file.
CPP_TEST_BROKEN_CXX = CPP_TEST_BROKEN_CXX =
# the error is wrap:action code generated by swig. \ # the error is wrap:action code generated by swig. \
# error: can't convert [std::string] 'b' to 'bool' \ # error: can't convert [std::string] 'b' to 'bool' \
# might just need a bool overload op for std::string. \ # might just need a bool overload op for std::string. \
@ -71,7 +71,7 @@ CPP_TEST_CASES_ACL_UNSUPPORTED = \
extern_throws \ extern_throws \
throw_exception \ throw_exception \
using_pointers \ using_pointers \
C_TEST_CASES_ACL_BROKEN = \ C_TEST_CASES_ACL_BROKEN = \
# 'cdate.i' module support \ # 'cdate.i' module support \
li_cdata \ li_cdata \
@ -96,7 +96,7 @@ include $(srcdir)/../common.mk
# none! # none!
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
$(run_testcase) $(run_testcase)
@ -106,7 +106,7 @@ include $(srcdir)/../common.mk
+$(swig_and_compile_c) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
$(run_testcase) $(run_testcase)
@ -123,4 +123,3 @@ run_testcase = \
clean: clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile allegrocl_clean $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile allegrocl_clean

View file

@ -14,13 +14,13 @@ include $(srcdir)/../common.mk
# Overridden variables here # Overridden variables here
# no C++ tests for now # no C++ tests for now
CPP_TEST_CASES = CPP_TEST_CASES =
#C_TEST_CASES += #C_TEST_CASES +=
# Custom tests - tests with additional commandline options # Custom tests - tests with additional commandline options
# none! # none!
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
$(run_testcase) $(run_testcase)
@ -30,7 +30,7 @@ CPP_TEST_CASES =
+$(swig_and_compile_c) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
$(run_testcase) $(run_testcase)
@ -44,8 +44,7 @@ run_testcase = \
# Clean: (does nothing, we dont generate extra cffi code) # Clean: (does nothing, we dont generate extra cffi code)
%.clean: %.clean:
@exit 0
clean: clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile cffi_clean $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile cffi_clean

View file

@ -3,7 +3,7 @@
####################################################################### #######################################################################
LANGUAGE = chicken LANGUAGE = chicken
VARIANT = VARIANT =
SCRIPTSUFFIX = _runme.ss SCRIPTSUFFIX = _runme.ss
PROXYSUFFIX = _runme_proxy.ss PROXYSUFFIX = _runme_proxy.ss
srcdir = @srcdir@ srcdir = @srcdir@
@ -17,7 +17,7 @@ SO = @SO@
# Skip the STD cases for now, except for li_std_string.i # Skip the STD cases for now, except for li_std_string.i
SKIP_CPP_STD_CASES = Yes SKIP_CPP_STD_CASES = Yes
CPP_TEST_CASES += li_std_string CPP_TEST_CASES += li_std_string
EXTRA_TEST_CASES += chicken_ext_test.externaltest EXTRA_TEST_CASES += chicken_ext_test.externaltest
@ -39,7 +39,7 @@ SWIGOPT += -nounit
%.multiproxy: SCRIPTSUFFIX = $(PROXYSUFFIX) %.multiproxy: SCRIPTSUFFIX = $(PROXYSUFFIX)
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
$(run_testcase) $(run_testcase)
@ -55,7 +55,7 @@ SWIGOPT += -nounit
$(MAKE) $*.cproxy; \ $(MAKE) $*.cproxy; \
fi fi
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
$(run_testcase) $(run_testcase)
@ -92,7 +92,7 @@ run_testcase = \
# Clean # Clean
%.clean: %.clean:
@exit 0
clean: clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile chicken_clean $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile chicken_clean

View file

@ -14,13 +14,13 @@ include $(srcdir)/../common.mk
# Overridden variables here # Overridden variables here
# no C++ tests for now # no C++ tests for now
CPP_TEST_CASES = CPP_TEST_CASES =
#C_TEST_CASES += #C_TEST_CASES +=
# Custom tests - tests with additional commandline options # Custom tests - tests with additional commandline options
# none! # none!
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
$(run_testcase) $(run_testcase)
@ -30,7 +30,7 @@ CPP_TEST_CASES =
+$(swig_and_compile_c) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
$(run_testcase) $(run_testcase)
@ -44,8 +44,7 @@ run_testcase = \
# Clean: (does nothing, we dont generate extra clisp code) # Clean: (does nothing, we dont generate extra clisp code)
%.clean: %.clean:
@exit 0
clean: clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile clisp_clean $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile clisp_clean

View file

@ -40,7 +40,7 @@ csharp_lib_arrays.cpptest: CSHARPFLAGSSPECIAL = -unsafe
csharp_swig2_compatibility.cpptest: SWIGOPT += -DSWIG2_CSHARP csharp_swig2_compatibility.cpptest: SWIGOPT += -DSWIG2_CSHARP
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+(cd $* && $(swig_and_compile_cpp)) +(cd $* && $(swig_and_compile_cpp))
+$(run_testcase) +$(run_testcase)
@ -50,7 +50,7 @@ csharp_swig2_compatibility.cpptest: SWIGOPT += -DSWIG2_CSHARP
+(cd $* && $(swig_and_compile_c)) +(cd $* && $(swig_and_compile_c))
+$(run_testcase) +$(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+(cd $* && $(swig_and_compile_multi_cpp)) +(cd $* && $(swig_and_compile_multi_cpp))
+$(run_testcase) +$(run_testcase)

View file

@ -29,13 +29,13 @@ CPP_ERROR_TEST_CASES := $(filter cpp_%, $(ALL_ERROR_TEST_CASES))
C_ERROR_TEST_CASES := $(filter-out $(CPP_ERROR_TEST_CASES), $(ALL_ERROR_TEST_CASES)) C_ERROR_TEST_CASES := $(filter-out $(CPP_ERROR_TEST_CASES), $(ALL_ERROR_TEST_CASES))
ERROR_TEST_CASES := $(CPP_ERROR_TEST_CASES:=.cpptest) \ ERROR_TEST_CASES := $(CPP_ERROR_TEST_CASES:=.cpptest) \
$(C_ERROR_TEST_CASES:=.ctest) $(C_ERROR_TEST_CASES:=.ctest)
include $(srcdir)/../common.mk include $(srcdir)/../common.mk
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
echo "$(ACTION)ing errors testcase $*" echo "$(ACTION)ing errors testcase $*"
-$(SWIG) -c++ -python -Wall -Fstandard $(SWIGOPT) $*.i 2>&1 | $(TODOS) > $*.$(ERROR_EXT) -$(SWIG) -c++ -python -Wall -Fstandard $(SWIGOPT) $*.i 2>&1 | $(TODOS) > $*.$(ERROR_EXT)
$(COMPILETOOL) diff -c $*.stderr $*.$(ERROR_EXT) $(COMPILETOOL) diff -c $*.stderr $*.$(ERROR_EXT)
@ -46,9 +46,8 @@ include $(srcdir)/../common.mk
$(COMPILETOOL) diff -c $*.stderr $*.$(ERROR_EXT) $(COMPILETOOL) diff -c $*.stderr $*.$(ERROR_EXT)
%.clean: %.clean:
@exit 0
clean: clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile $(LANGUAGE)_clean $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile $(LANGUAGE)_clean
@rm -f *.$(ERROR_EXT) *.py @rm -f *.$(ERROR_EXT) *.py

View file

@ -29,7 +29,7 @@ include $(srcdir)/../common.mk
.SUFFIXES: .cpptest .ctest .multicpptest .SUFFIXES: .cpptest .ctest .multicpptest
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
$(run_testcase_cpp) $(run_testcase_cpp)
@ -39,7 +39,7 @@ include $(srcdir)/../common.mk
+$(swig_and_compile_c) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
$(run_multi_testcase) $(run_multi_testcase)

View file

@ -14,9 +14,9 @@ GUILE = @GUILE@
GUILE_RUNTIME= GUILE_RUNTIME=
C_TEST_CASES = long_long \ C_TEST_CASES = long_long \
list_vector \ list_vector \
multivalue \ multivalue \
pointer_in_out pointer_in_out
include $(srcdir)/../common.mk include $(srcdir)/../common.mk
@ -28,7 +28,7 @@ INCLUDES += -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/guile
%.multicpptest: SWIGOPT += $(GUILE_RUNTIME) %.multicpptest: SWIGOPT += $(GUILE_RUNTIME)
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
$(run_testcase) $(run_testcase)
@ -38,7 +38,7 @@ INCLUDES += -I$(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/guile
+$(swig_and_compile_c) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
$(run_testcase) $(run_testcase)

View file

@ -55,7 +55,7 @@ director_nspace.%: JAVA_PACKAGE = $*Package
director_nspace_director_name_collision.%: JAVA_PACKAGE = $*Package director_nspace_director_name_collision.%: JAVA_PACKAGE = $*Package
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+(cd $(JAVA_PACKAGE) && $(swig_and_compile_cpp)) +(cd $(JAVA_PACKAGE) && $(swig_and_compile_cpp))
$(run_testcase) $(run_testcase)
@ -65,7 +65,7 @@ director_nspace_director_name_collision.%: JAVA_PACKAGE = $*Package
+(cd $(JAVA_PACKAGE) && $(swig_and_compile_c)) +(cd $(JAVA_PACKAGE) && $(swig_and_compile_c))
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+(cd $(JAVA_PACKAGE) && $(swig_and_compile_multi_cpp)) +(cd $(JAVA_PACKAGE) && $(swig_and_compile_multi_cpp))
$(run_testcase) $(run_testcase)

View file

@ -28,7 +28,7 @@ LIBS = -L.
lua_no_module_global.%: SWIGOPT += -nomoduleglobal lua_no_module_global.%: SWIGOPT += -nomoduleglobal
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
$(run_testcase) $(run_testcase)
@ -38,7 +38,7 @@ lua_no_module_global.%: SWIGOPT += -nomoduleglobal
+$(swig_and_compile_c) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
$(run_testcase) $(run_testcase)
@ -52,7 +52,7 @@ run_testcase = \
# Clean: (does nothing, we dont generate extra lua code) # Clean: (does nothing, we dont generate extra lua code)
%.clean: %.clean:
@exit 0
clean: clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile lua_clean $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile lua_clean
@ -60,5 +60,5 @@ clean:
cvsignore: cvsignore:
@echo '*wrap* *.so *.dll *.exp *.lib' @echo '*wrap* *.so *.dll *.exp *.lib'
@echo Makefile @echo Makefile
@for i in ${CPP_TEST_CASES} ${C_TEST_CASES}; do echo $$i.lua; done @for i in ${CPP_TEST_CASES} ${C_TEST_CASES}; do echo $$i.lua; done
@for i in ${CPP_TEST_CASES} ${C_TEST_CASES}; do if grep -q $${i}_runme.lua CVS/Entries ; then echo $${i}_runme.lua; fi; done @for i in ${CPP_TEST_CASES} ${C_TEST_CASES}; do if grep -q $${i}_runme.lua CVS/Entries ; then echo $${i}_runme.lua; fi; done

View file

@ -18,7 +18,7 @@ include $(srcdir)/../common.mk
# none! # none!
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
$(run_testcase) $(run_testcase)
@ -28,7 +28,7 @@ include $(srcdir)/../common.mk
+$(swig_and_compile_c) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
$(run_testcase) $(run_testcase)
@ -42,7 +42,7 @@ run_testcase = \
# Clean # Clean
%.clean: %.clean:
@exit 0
clean: clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile mzscheme_clean $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile mzscheme_clean

View file

@ -10,7 +10,7 @@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
C_TEST_CASES = C_TEST_CASES =
run_testcase = \ run_testcase = \
if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) -a \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) -a \
@ -21,7 +21,7 @@ run_testcase = \
$(COMPILETOOL) $(OCAMLC) -c $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \ $(COMPILETOOL) $(OCAMLC) -c $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX); \
$(COMPILETOOL) $(OCAMLC) swig.cmo -custom -g -cc '$(CXX)' -o runme $(srcdir)/$(*).cmo $(srcdir)/$(*)_runme.cmo $(srcdir)/$(*)_wrap.o && \ $(COMPILETOOL) $(OCAMLC) swig.cmo -custom -g -cc '$(CXX)' -o runme $(srcdir)/$(*).cmo $(srcdir)/$(*)_runme.cmo $(srcdir)/$(*)_wrap.o && \
$(RUNTOOL) ./runme; \ $(RUNTOOL) ./runme; \
fi ; fi ;
check_quant: check_quant:
cat /dev/null > testing cat /dev/null > testing

View file

@ -21,7 +21,7 @@ CPP_TEST_BROKEN += \
li_std_set \ li_std_set \
li_std_stream li_std_stream
#C_TEST_CASES += #C_TEST_CASES +=
# #
# This test only works with modern C compilers # This test only works with modern C compilers
@ -39,7 +39,7 @@ CSRCS = $(srcdir)/octave_empty.c
# none! # none!
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
$(run_testcase) $(run_testcase)
@ -49,7 +49,7 @@ CSRCS = $(srcdir)/octave_empty.c
+$(swig_and_compile_c) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
$(run_testcase) $(run_testcase)
@ -72,13 +72,13 @@ clean:
cvsignore: cvsignore:
@echo '*wrap* *.mc *.so *.dll *.exp *.lib' @echo '*wrap* *.mc *.so *.dll *.exp *.lib'
@echo Makefile @echo Makefile
@for i in ${CPP_TEST_CASES} ${C_TEST_CASES}; do echo $$i.m; done @for i in ${CPP_TEST_CASES} ${C_TEST_CASES}; do echo $$i.m; done
@for i in ${CPP_TEST_CASES} ${C_TEST_CASES}; do if grep -q $${i}_runme.m CVS/Entries ; then echo $${i}_runme.m; fi; done @for i in ${CPP_TEST_CASES} ${C_TEST_CASES}; do if grep -q $${i}_runme.m CVS/Entries ; then echo $${i}_runme.m; fi; done
@echo clientdata_prop_a.m @echo clientdata_prop_a.m
@echo clientdata_prop_b.m @echo clientdata_prop_b.m
@echo imports_a.m @echo imports_a.m
@echo imports_b.m @echo imports_b.m
@echo mod_a.m mod_b.m @echo mod_a.m mod_b.m
@echo hugemod.h hugemod_a.i hugemod_b.i hugemod_a.m hugemod_b.m hugemod_runme.m @echo hugemod.h hugemod_a.i hugemod_b.i hugemod_a.m hugemod_b.m hugemod_runme.m
@echo template_typedef_import.m @echo template_typedef_import.m

View file

@ -31,7 +31,7 @@ include $(srcdir)/../common.mk
# none! # none!
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
$(run_testcase) $(run_testcase)
@ -41,7 +41,7 @@ include $(srcdir)/../common.mk
+$(swig_and_compile_c) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
$(run_testcase) $(run_testcase)

View file

@ -29,7 +29,7 @@ missingctests:
missingtests: missingcpptests missingctests missingtests: missingcpptests missingctests
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
+$(run_testcase) +$(run_testcase)
@ -39,7 +39,7 @@ missingtests: missingcpptests missingctests
+$(swig_and_compile_c) +$(swig_and_compile_c)
+$(run_testcase) +$(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
+$(run_testcase) +$(run_testcase)

View file

@ -18,7 +18,7 @@ include $(srcdir)/../common.mk
# none! # none!
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
$(run_testcase) $(run_testcase)
@ -28,7 +28,7 @@ include $(srcdir)/../common.mk
+$(swig_and_compile_c) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
$(run_testcase) $(run_testcase)
@ -46,4 +46,3 @@ run_testcase = \
clean: clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile pike_clean $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile pike_clean

View file

@ -26,7 +26,7 @@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
PY2TO3 = 2to3 -x import PY2TO3 = 2to3 -x import
CPP_TEST_CASES += \ CPP_TEST_CASES += \
@ -109,7 +109,7 @@ VALGRIND_OPT += --suppressions=pythonswig.supp
# none! # none!
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
+$(convert_testcase) +$(convert_testcase)
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
@ -121,7 +121,7 @@ VALGRIND_OPT += --suppressions=pythonswig.supp
+$(swig_and_compile_c) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
+$(convert_testcase) +$(convert_testcase)
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
@ -131,7 +131,7 @@ VALGRIND_OPT += --suppressions=pythonswig.supp
# Call 2to3 to generate Python 3.x test from the Python 2.x's *_runme.py file # Call 2to3 to generate Python 3.x test from the Python 2.x's *_runme.py file
%$(PY3SCRIPTSUFFIX): %$(PY2SCRIPTSUFFIX) %$(PY3SCRIPTSUFFIX): %$(PY2SCRIPTSUFFIX)
cp $< $@ cp $< $@
$(PY2TO3) -w $@ >/dev/null 2>&1 $(PY2TO3) -w $@ >/dev/null 2>&1
# Runs the testcase. A testcase is only run if # Runs the testcase. A testcase is only run if
@ -172,12 +172,12 @@ clean:
cvsignore: cvsignore:
@echo '*wrap* *.pyc *.so *.dll *.exp *.lib' @echo '*wrap* *.pyc *.so *.dll *.exp *.lib'
@echo Makefile @echo Makefile
@for i in ${CPP_TEST_CASES} ${C_TEST_CASES}; do echo $$i.py; done @for i in ${CPP_TEST_CASES} ${C_TEST_CASES}; do echo $$i.py; done
@for i in ${CPP_TEST_CASES} ${C_TEST_CASES}; do if grep -q $${i}_runme.py CVS/Entries ; then echo $${i}_runme.py; fi; done @for i in ${CPP_TEST_CASES} ${C_TEST_CASES}; do if grep -q $${i}_runme.py CVS/Entries ; then echo $${i}_runme.py; fi; done
@echo clientdata_prop_a.py @echo clientdata_prop_a.py
@echo clientdata_prop_b.py @echo clientdata_prop_b.py
@echo imports_a.py @echo imports_a.py
@echo imports_b.py @echo imports_b.py
@echo mod_a.py mod_b.py @echo mod_a.py mod_b.py
@echo hugemod.h hugemod_a.i hugemod_b.i hugemod_a.py hugemod_b.py hugemod_runme.py @echo hugemod.h hugemod_a.i hugemod_b.i hugemod_a.py hugemod_b.py hugemod_runme.py
@echo template_typedef_import.py @echo template_typedef_import.py
@ -185,9 +185,8 @@ cvsignore:
hugemod_runme = hugemod$(SCRIPTPREFIX) hugemod_runme = hugemod$(SCRIPTPREFIX)
hugemod: hugemod:
perl hugemod.pl $(hugemod_runme) perl hugemod.pl $(hugemod_runme)
$(MAKE) hugemod_a.cpptest $(MAKE) hugemod_a.cpptest
$(MAKE) hugemod_b.cpptest $(MAKE) hugemod_b.cpptest
sh -c "time $(PYTHON) $(hugemod_runme)" sh -c "time $(PYTHON) $(hugemod_runme)"
sh -c "time $(PYTHON) $(hugemod_runme)" sh -c "time $(PYTHON) $(hugemod_runme)"

View file

@ -28,7 +28,7 @@ include $(srcdir)/../common.mk
# none! # none!
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
$(run_testcase) $(run_testcase)
@ -38,14 +38,14 @@ include $(srcdir)/../common.mk
+$(swig_and_compile_c) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
$(run_multitestcase) $(run_multitestcase)
# Runs the testcase. # Runs the testcase.
# #
# Run the runme if it exists. If not just load the R wrapper to # Run the runme if it exists. If not just load the R wrapper to
# check for syntactic correctness # check for syntactic correctness
run_testcase = \ run_testcase = \
if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$*$(SCRIPTSUFFIX) ]; then \
@ -58,7 +58,7 @@ run_multitestcase = \
for f in `cat $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list` ; do \ for f in `cat $(top_srcdir)/$(EXAMPLES)/$(TEST_SUITE)/$*.list` ; do \
if [ -f $(srcdir)/$(SCRIPTPREFIX)$${f}$(SCRIPTSUFFIX) ]; then \ if [ -f $(srcdir)/$(SCRIPTPREFIX)$${f}$(SCRIPTSUFFIX) ]; then \
env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=.:"$$PATH" \ env LD_LIBRARY_PATH=.:$$LD_LIBRARY_PATH PATH=.:"$$PATH" \
$(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(SCRIPTSUFFIX); \ $(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(SCRIPTSUFFIX); \
else \ else \
$(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(WRAPSUFFIX); \ $(RUNTOOL) $(RUNR) $(srcdir)/$(SCRIPTPREFIX)$${f}$(WRAPSUFFIX); \
fi; \ fi; \
@ -74,5 +74,3 @@ clean:
rm -f $${f}.R $${f}.Rout ; \ rm -f $${f}.R $${f}.Rout ; \
done \ done \
fi fi

View file

@ -42,7 +42,7 @@ SWIGOPT += -w801 -noautorename -features autodoc=4
ruby_naming.cpptest: SWIGOPT += -autorename ruby_naming.cpptest: SWIGOPT += -autorename
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
$(run_testcase) $(run_testcase)
@ -52,7 +52,7 @@ ruby_naming.cpptest: SWIGOPT += -autorename
+$(swig_and_compile_c) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
$(run_testcase) $(run_testcase)
@ -66,7 +66,7 @@ run_testcase = \
# Clean # Clean
%.clean: %.clean:
@exit 0
clean: clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile ruby_clean $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile ruby_clean

View file

@ -4,7 +4,7 @@
LANGUAGE = tcl LANGUAGE = tcl
TCLSH = tclsh TCLSH = tclsh
SCRIPTSUFFIX = _runme.tcl SCRIPTSUFFIX = _runme.tcl
srcdir = @srcdir@ srcdir = @srcdir@
top_srcdir = @top_srcdir@ top_srcdir = @top_srcdir@
top_builddir = @top_builddir@ top_builddir = @top_builddir@
@ -27,7 +27,7 @@ include $(srcdir)/../common.mk
# none! # none!
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
$(run_testcase) $(run_testcase)
@ -37,7 +37,7 @@ include $(srcdir)/../common.mk
+$(swig_and_compile_c) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
$(run_testcase) $(run_testcase)
@ -51,7 +51,7 @@ run_testcase = \
# Clean # Clean
%.clean: %.clean:
@exit 0
clean: clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile tcl_clean $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile tcl_clean

View file

@ -14,13 +14,13 @@ include $(srcdir)/../common.mk
# Overridden variables here # Overridden variables here
# no C++ tests for now # no C++ tests for now
CPP_TEST_CASES = CPP_TEST_CASES =
#C_TEST_CASES += #C_TEST_CASES +=
# Custom tests - tests with additional commandline options # Custom tests - tests with additional commandline options
# none! # none!
# Rules for the different types of tests # Rules for the different types of tests
%.cpptest: %.cpptest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_cpp)
$(run_testcase) $(run_testcase)
@ -30,7 +30,7 @@ CPP_TEST_CASES =
+$(swig_and_compile_c) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:
$(setup) $(setup)
+$(swig_and_compile_multi_cpp) +$(swig_and_compile_multi_cpp)
$(run_testcase) $(run_testcase)
@ -44,8 +44,7 @@ run_testcase = \
# Clean: (does nothing, we dont generate extra uffi code) # Clean: (does nothing, we dont generate extra uffi code)
%.clean: %.clean:
@exit 0
clean: clean:
$(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile uffi_clean $(MAKE) -f $(top_builddir)/$(EXAMPLES)/Makefile uffi_clean

View file

@ -1,4 +1,3 @@
co: co:
co RCS/*.i* RCS/*.swg* co RCS/*.i* RCS/*.swg*

View file

@ -1,4 +1,3 @@
co: co:
co RCS/*.i* RCS/*.swg* co RCS/*.i* RCS/*.swg*

View file

@ -1,6 +1,6 @@
# --------------------------------------------------------------- # ---------------------------------------------------------------
# SWIG Perl5 Makefile # SWIG Perl5 Makefile
# #
# This file can be used to build various Perl5 extensions with SWIG. # This file can be used to build various Perl5 extensions with SWIG.
# By default this file is set up for dynamic loading, but it can # By default this file is set up for dynamic loading, but it can
# be easily customized for static extensions by modifying various # be easily customized for static extensions by modifying various
@ -17,11 +17,11 @@
# script and should already reflect your machine. # script and should already reflect your machine.
#---------------------------------------------------------------- #----------------------------------------------------------------
SRCS = SRCS =
CXXSRCS = CXXSRCS =
OBJCSRCS = OBJCSRCS =
OBJS = OBJS =
INTERFACE = INTERFACE =
WRAPFILE = $(INTERFACE:.i=_wrap.c) WRAPFILE = $(INTERFACE:.i=_wrap.c)
WRAPOBJ = $(INTERFACE:.i=_wrap.o) WRAPOBJ = $(INTERFACE:.i=_wrap.o)
TARGET = module@SO@ # Use this kind of target for dynamic loading TARGET = module@SO@ # Use this kind of target for dynamic loading
@ -32,8 +32,8 @@ exec_prefix = @exec_prefix@
CC = @CC@ CC = @CC@
CXX = @CXX@ CXX = @CXX@
OBJC = @CC@ -Wno-import # -Wno-import needed for gcc OBJC = @CC@ -Wno-import # -Wno-import needed for gcc
CFLAGS = CFLAGS =
INCLUDES = INCLUDES =
LIBS = LIBS =
@ -42,9 +42,9 @@ LIBS =
# SWIGOPT = SWIG compiler options # SWIGOPT = SWIG compiler options
# SWIGCC = Compiler used to compile the wrapper file # SWIGCC = Compiler used to compile the wrapper file
SWIG = $(exec_prefix)/bin/swig SWIG = $(exec_prefix)/bin/swig
SWIGOPT = -perl5 SWIGOPT = -perl5
SWIGCC = $(CC) SWIGCC = $(CC)
# SWIG Library files. Uncomment this to statically rebuild Perl # SWIG Library files. Uncomment this to statically rebuild Perl
#SWIGLIBS = -static -lperlmain.i #SWIGLIBS = -static -lperlmain.i
@ -67,12 +67,12 @@ BUILD = @LDSHARED@
# need to provide additional link libraries (this is not always required). # need to provide additional link libraries (this is not always required).
#DLL_LIBS = -L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \ #DLL_LIBS = -L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \
-L/usr/local/lib -lg++ -lstdc++ -lgcc -L/usr/local/lib -lg++ -lstdc++ -lgcc
# Perl installation # Perl installation
PERL_INCLUDE = -I@PERL5EXT@ PERL_INCLUDE = -I@PERL5EXT@
PERL_LIB = -L@PERL5EXT@ -lperl PERL_LIB = -L@PERL5EXT@ -lperl
PERL_FLAGS = -Dbool=char -Dexplicit= PERL_FLAGS = -Dbool=char -Dexplicit=
# Build libraries (needed for static builds) # Build libraries (needed for static builds)
@ -118,9 +118,3 @@ $(TARGET): $(WRAPOBJ) $(ALLOBJS)
clean: clean:
rm -f $(COBJS) $(CXXOBJS) $(OBJCOBJS) $(WRAPOBJ) $(WRAPFILE) $(TARGET) rm -f $(COBJS) $(CXXOBJS) $(OBJCOBJS) $(WRAPOBJ) $(WRAPFILE) $(TARGET)

View file

@ -7,7 +7,7 @@
# 2. Run perl as 'perl Makefile.pl' # 2. Run perl as 'perl Makefile.pl'
# 3. Type 'make' to build your module # 3. Type 'make' to build your module
# 4. Type 'make install' to install your module. # 4. Type 'make install' to install your module.
# #
# See "Programming Perl", 2nd. Ed, for more gory details than # See "Programming Perl", 2nd. Ed, for more gory details than
# you ever wanted to know. # you ever wanted to know.
@ -17,5 +17,3 @@ WriteMakefile(
'LIBS' => [''], # Custom libraries (if any) 'LIBS' => [''], # Custom libraries (if any)
'OBJECT' => '$module_wrap.o' # Object files 'OBJECT' => '$module_wrap.o' # Object files
); );

View file

@ -1,6 +1,6 @@
# --------------------------------------------------------------- # ---------------------------------------------------------------
# SWIG Python Makefile # SWIG Python Makefile
# #
# This file can be used to build various Python extensions with SWIG. # This file can be used to build various Python extensions with SWIG.
# By default this file is set up for dynamic loading, but it can # By default this file is set up for dynamic loading, but it can
# be easily customized for static extensions by modifying various # be easily customized for static extensions by modifying various
@ -17,11 +17,11 @@
# script and should already reflect your machine. # script and should already reflect your machine.
#---------------------------------------------------------------- #----------------------------------------------------------------
SRCS = SRCS =
CXXSRCS = CXXSRCS =
OBJCSRCS = OBJCSRCS =
OBJS = OBJS =
INTERFACE = INTERFACE =
WRAPFILE = $(INTERFACE:.i=_wrap.c) WRAPFILE = $(INTERFACE:.i=_wrap.c)
WRAPOBJ = $(INTERFACE:.i=_wrap.o) WRAPOBJ = $(INTERFACE:.i=_wrap.o)
TARGET = module@SO@ # Use this kind of target for dynamic loading TARGET = module@SO@ # Use this kind of target for dynamic loading
@ -32,8 +32,8 @@ exec_prefix = @exec_prefix@
CC = @CC@ CC = @CC@
CXX = @CXX@ CXX = @CXX@
OBJC = @CC@ -Wno-import # -Wno-import needed for gcc OBJC = @CC@ -Wno-import # -Wno-import needed for gcc
CFLAGS = CFLAGS =
INCLUDES = INCLUDES =
LIBS = LIBS =
@ -42,9 +42,9 @@ LIBS =
# SWIGOPT = SWIG compiler options # SWIGOPT = SWIG compiler options
# SWIGCC = Compiler used to compile the wrapper file # SWIGCC = Compiler used to compile the wrapper file
SWIG = $(exec_prefix)/bin/swig SWIG = $(exec_prefix)/bin/swig
SWIGOPT = -python SWIGOPT = -python
SWIGCC = $(CC) SWIGCC = $(CC)
# SWIG Library files. Uncomment if rebuilding the Python interpreter # SWIG Library files. Uncomment if rebuilding the Python interpreter
#SWIGLIBS = -lembed.i #SWIGLIBS = -lembed.i
@ -67,11 +67,11 @@ BUILD = @LDSHARED@
# need to provide additional link libraries (this is not always required). # need to provide additional link libraries (this is not always required).
#DLL_LIBS = -L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \ #DLL_LIBS = -L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \
-L/usr/local/lib -lg++ -lstdc++ -lgcc -L/usr/local/lib -lg++ -lstdc++ -lgcc
# Python installation # Python installation
PY_INCLUDE = -DHAVE_CONFIG_H @PYINCLUDE@ PY_INCLUDE = -DHAVE_CONFIG_H @PYINCLUDE@
PY_LIB = @PYLIB@ PY_LIB = @PYLIB@
# Build libraries (needed for static builds) # Build libraries (needed for static builds)
@ -107,7 +107,7 @@ all: $(TARGET)
# Convert the wrapper file into an object file # Convert the wrapper file into an object file
$(WRAPOBJ) : $(WRAPFILE) $(WRAPOBJ) : $(WRAPFILE)
$(SWIGCC) -c $(CCSHARED) $(CFLAGS) $(WRAPFILE) $(INCLUDES) $(PY_INCLUDE) $(SWIGCC) -c $(CCSHARED) $(CFLAGS) $(WRAPFILE) $(INCLUDES) $(PY_INCLUDE)
$(WRAPFILE) : $(INTERFACE) $(WRAPFILE) : $(INTERFACE)
$(SWIG) $(SWIGOPT) -o $(WRAPFILE) $(SWIGLIBS) $(INTERFACE) $(SWIG) $(SWIGOPT) -o $(WRAPFILE) $(SWIGLIBS) $(INTERFACE)
@ -117,7 +117,3 @@ $(TARGET): $(WRAPOBJ) $(ALLOBJS)
clean: clean:
rm -f $(COBJS) $(CXXOBJS) $(OBJCOBJS) $(WRAPOBJ) $(WRAPFILE) $(TARGET) rm -f $(COBJS) $(CXXOBJS) $(OBJCOBJS) $(WRAPOBJ) $(WRAPFILE) $(TARGET)

View file

@ -7,7 +7,7 @@
# 3. Type 'make -f Makefile.swig' to generate wrapper code and Makefile. # 3. Type 'make -f Makefile.swig' to generate wrapper code and Makefile.
# 4. Type 'make' to build your extension. # 4. Type 'make' to build your extension.
# 5. Type 'make install' to install your extension. # 5. Type 'make install' to install your extension.
# #
MODULE = yourmodule MODULE = yourmodule
FEATURE = $(MODULE) FEATURE = $(MODULE)

View file

@ -1,10 +1,10 @@
# --------------------------------------------------------------- # ---------------------------------------------------------------
# SWIG Tcl Makefile # SWIG Tcl Makefile
# #
# This file can be used to build various Tcl extensions with SWIG. # This file can be used to build various Tcl extensions with SWIG.
# By default this file is set up for dynamic loading, but it can # By default this file is set up for dynamic loading, but it can
# be easily customized for static extensions by modifying various # be easily customized for static extensions by modifying various
# portions of the file. # portions of the file.
# #
# SRCS = C source files # SRCS = C source files
# CXXSRCS = C++ source files # CXXSRCS = C++ source files
@ -19,11 +19,11 @@
# application. # application.
#---------------------------------------------------------------- #----------------------------------------------------------------
SRCS = SRCS =
CXXSRCS = CXXSRCS =
OBJCSRCS = OBJCSRCS =
OBJS = OBJS =
INTERFACE = INTERFACE =
WRAPFILE = $(INTERFACE:.i=_wrap.c) WRAPFILE = $(INTERFACE:.i=_wrap.c)
WRAPOBJ = $(INTERFACE:.i=_wrap.o) WRAPOBJ = $(INTERFACE:.i=_wrap.o)
TARGET = module@SO@ # Use this kind of target for dynamic loading TARGET = module@SO@ # Use this kind of target for dynamic loading
@ -34,8 +34,8 @@ exec_prefix = @exec_prefix@
CC = @CC@ CC = @CC@
CXX = @CXX@ CXX = @CXX@
OBJC = @CC@ -Wno-import # -Wno-import needed for gcc OBJC = @CC@ -Wno-import # -Wno-import needed for gcc
CFLAGS = CFLAGS =
INCLUDES = INCLUDES =
LIBS = LIBS =
@ -44,9 +44,9 @@ LIBS =
# SWIGOPT = SWIG compiler options # SWIGOPT = SWIG compiler options
# SWIGCC = Compiler used to compile the wrapper file # SWIGCC = Compiler used to compile the wrapper file
SWIG = $(exec_prefix)/bin/swig SWIG = $(exec_prefix)/bin/swig
SWIGOPT = -tcl # use -tcl8 for Tcl 8.0 SWIGOPT = -tcl # use -tcl8 for Tcl 8.0
SWIGCC = $(CC) SWIGCC = $(CC)
# SWIG Library files. Uncomment if rebuilding tclsh # SWIG Library files. Uncomment if rebuilding tclsh
#SWIGLIBS = -ltclsh.i #SWIGLIBS = -ltclsh.i
@ -69,7 +69,7 @@ BUILD = @LDSHARED@
# need to provide additional link libraries (this is not always required). # need to provide additional link libraries (this is not always required).
#DLL_LIBS = -L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \ #DLL_LIBS = -L/usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.7.2 \
-L/usr/local/lib -lg++ -lstdc++ -lgcc -L/usr/local/lib -lg++ -lstdc++ -lgcc
# Tcl installation (where is Tcl located) # Tcl installation (where is Tcl located)
@ -85,7 +85,7 @@ SYSLIBS = $(LIBM) $(LIBC) @LIBS@
# Build options (uncomment only one of these) # Build options (uncomment only one of these)
BUILD_LIBS = $(LIBS) # Dynamic loading BUILD_LIBS = $(LIBS) # Dynamic loading
#BUILD_LIBS = $(TCL_LIB) -ltcl $(LIBS) $(SYSLIBS) # tclsh #BUILD_LIBS = $(TCL_LIB) -ltcl $(LIBS) $(SYSLIBS) # tclsh
# Compilation rules for non-SWIG components # Compilation rules for non-SWIG components
@ -110,7 +110,7 @@ all: $(TARGET)
# Convert the wrapper file into an object file # Convert the wrapper file into an object file
$(WRAPOBJ) : $(WRAPFILE) $(WRAPOBJ) : $(WRAPFILE)
$(SWIGCC) -c $(CCSHARED) $(CFLAGS) $(WRAPFILE) $(INCLUDES) $(TCL_INCLUDE) $(SWIGCC) -c $(CCSHARED) $(CFLAGS) $(WRAPFILE) $(INCLUDES) $(TCL_INCLUDE)
$(WRAPFILE) : $(INTERFACE) $(WRAPFILE) : $(INTERFACE)
$(SWIG) $(SWIGOPT) -o $(WRAPFILE) $(SWIGLIBS) $(INTERFACE) $(SWIG) $(SWIGOPT) -o $(WRAPFILE) $(SWIGLIBS) $(INTERFACE)
@ -120,7 +120,3 @@ $(TARGET): $(WRAPOBJ) $(ALLOBJS)
clean: clean:
rm -f $(COBJS) $(CXXOBJS) $(OBJCOBJS) $(WRAPOBJ) $(WRAPFILE) $(TARGET) rm -f $(COBJS) $(CXXOBJS) $(OBJCOBJS) $(WRAPOBJ) $(WRAPFILE) $(TARGET)

View file

@ -249,8 +249,8 @@ check-%-examples :
# gcj individual example # gcj individual example
java.actionexample: java.actionexample:
@if $(skip-gcj); then \ @if $(skip-gcj); then \
echo "skipping Examples/$(LANGUAGE)/java $(ACTION) (gcj test)"; \ echo "skipping Examples/$(LANGUAGE)/java $(ACTION) (gcj test)"; \
else \ else \
echo $(ACTION)ing Examples/$(LANGUAGE)/java; \ echo $(ACTION)ing Examples/$(LANGUAGE)/java; \
(cd Examples/$(LANGUAGE)/java && $(MAKE) $(FLAGS) $(chk-set-env) $(ACTION)) \ (cd Examples/$(LANGUAGE)/java && $(MAKE) $(FLAGS) $(chk-set-env) $(ACTION)) \
fi fi
@ -481,13 +481,13 @@ lib-languages = gcj typemaps tcl perl5 python guile java mzscheme ruby php ocaml
lib-modules = std lib-modules = std
install-lib: install-lib:
@echo "Installing the SWIG library" @echo "Installing the SWIG library"
@$(MKINSTDIRS) $(DESTDIR)$(SWIG_LIB) @$(MKINSTDIRS) $(DESTDIR)$(SWIG_LIB)
@for file in $(srcdir)/Lib/*.i $(srcdir)/Lib/*.swg ; do \ @for file in $(srcdir)/Lib/*.i $(srcdir)/Lib/*.swg ; do \
i=`basename $$file` ; \ i=`basename $$file` ; \
echo "Installing $(DESTDIR)$(SWIG_LIB)/$$i"; \ echo "Installing $(DESTDIR)$(SWIG_LIB)/$$i"; \
$(INSTALL_DATA) $$file $(DESTDIR)$(SWIG_LIB)/$$i; \ $(INSTALL_DATA) $$file $(DESTDIR)$(SWIG_LIB)/$$i; \
done; done;
@for lang in $(lib-languages) $(lib-modules); \ @for lang in $(lib-languages) $(lib-modules); \
do \ do \

View file

@ -90,7 +90,7 @@ eswig_SOURCES = CParse/cscanner.c \
Swig/typeobj.c \ Swig/typeobj.c \
Swig/typemap.c \ Swig/typemap.c \
Swig/typesys.c \ Swig/typesys.c \
Swig/wrapfunc.c Swig/wrapfunc.c
bin_PROGRAMS = eswig bin_PROGRAMS = eswig
eswig_LDADD = @SWIGLIBS@ eswig_LDADD = @SWIGLIBS@
@ -99,7 +99,7 @@ eswig_LDADD = @SWIGLIBS@
CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
# The executable is copied to the root directory for installation and running the test-suite. # The executable is copied to the root directory for installation and running the test-suite.
# This occurs on each invocation of make and is a step towards providing support for multiple # This occurs on each invocation of make and is a step towards providing support for multiple
# build directories. # build directories.
all-local: eswig@EXEEXT@ all-local: eswig@EXEEXT@
cp -f $(top_builddir)/Source/eswig@EXEEXT@ $(top_builddir)/swig@EXEEXT@ cp -f $(top_builddir)/Source/eswig@EXEEXT@ $(top_builddir)/swig@EXEEXT@
@ -145,4 +145,3 @@ beautify-file:
indent -kr --honour-newlines --line-length160 --indent-level2 --braces-on-func-def-line --leave-optional-blank-lines $(SWIGTYPEDEFS) $(INDENTFILE) -o $(INDENTFILE).tmp; indent -kr --honour-newlines --line-length160 --indent-level2 --braces-on-func-def-line --leave-optional-blank-lines $(SWIGTYPEDEFS) $(INDENTFILE) -o $(INDENTFILE).tmp;
cat $(INDENTFILE).tmp | sed -e 's/const const /const /' > $(INDENTFILE); cat $(INDENTFILE).tmp | sed -e 's/const const /const /' > $(INDENTFILE);
rm $(INDENTFILE).tmp; rm $(INDENTFILE).tmp;