jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change Octave to run C tests in SWIG C mode, not C++ mode

Browse source 
git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@12021 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
William S Fulton 2010-05-11 22:48:56 +00:00
commit e854baabec
3 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Examples/Makefile.in
View file

@ -346,7 +346,7 @@ OCTAVE_SO = @OCTAVE_SO@
octave: $(SRCS) octave: $(SRCS)
$(SWIG) -octave $(SWIGOPT) $(INTERFACEPATH) $(SWIG) -octave $(SWIGOPT) $(INTERFACEPATH)
$(CXX) -g -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(INCLUDES) -I$(OCTAVE_INCLUDE) $(CXX) -g -c $(CCSHARED) $(CFLAGS) $(ICXXSRCS) $(INCLUDES) -I$(OCTAVE_INCLUDE)
$(CC) -g -c $(CCSHARED) $(CFLAGS) $(SRCS) $(INCLUDES) $(CC) -g -c $(CCSHARED) $(CFLAGS) $(SRCS) $(CSRCS) $(INCLUDES)
$(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO) $(LDSHARED) $(CFLAGS) $(OBJS) $(IOBJS) $(OCTAVE_DLNK) $(LIBS) -o $(LIBPREFIX)$(TARGET)$(OCTAVE_SO)
# ----------------------------------------------------------------- # -----------------------------------------------------------------

3
Examples/test-suite/octave/Makefile.in
View file

@ -32,6 +32,7 @@ include $(srcdir)/../common.mk
# Overridden variables here # Overridden variables here
LIBS = -L. LIBS = -L.
CSRCS = octave_empty.c
# Custom tests - tests with additional commandline options # Custom tests - tests with additional commandline options
# none! # none!
@ -44,7 +45,7 @@ LIBS = -L.
%.ctest: %.ctest:
$(setup) $(setup)
+$(swig_and_compile_cpp) +$(swig_and_compile_c)
$(run_testcase) $(run_testcase)
%.multicpptest: %.multicpptest:

1
Examples/test-suite/octave/octave_empty.c Normal file
View file

@ -0,0 +1 @@
/* empty C file for the Octave test-suite C tests is needed - build system workaround as the generated files for Octave are C++ files */