diff options
| author | Joel Andersson <j.a.e.andersson@gmail.com> | 2016-07-05 18:03:37 -0500 |
|---|---|---|
| committer | Joel Andersson <j.a.e.andersson@gmail.com> | 2016-07-05 18:03:37 -0500 |
| commit | c1c36cc81e27bed901b72e3c30a216c56bfa4d67 (patch) | |
| tree | 60b168f17bed335f952399c5ad915c39b99d12be | |
| parent | 38af59f3bae7354b4575d7b8985de137a2850e27 (diff) | |
| download | swig-c1c36cc81e27bed901b72e3c30a216c56bfa4d67.tar.gz | |
Issue #67 Buildsystem cleanup
| -rw-r--r-- | Examples/Makefile.in | 18 | ||||
| -rw-r--r-- | configure.ac | 14 |
2 files changed, 18 insertions, 14 deletions
diff --git a/Examples/Makefile.in b/Examples/Makefile.in index 5778621fc..c720761e9 100644 --- a/Examples/Makefile.in +++ b/Examples/Makefile.in @@ -488,14 +488,14 @@ octave_clean: # Make sure these locate your Matlab installation MATLAB = @MATLAB@ -MATLABOPTS = -nodisplay -nosplash -nojvm -#MATLAB_CXX = $(DEFS) @MATLAB_CPPFLAGS@ @MATLAB_CXXFLAGS@ +MATLAB_OPTS = @MATLAB_OPTS@ +MATLAB_EXEC = @MATLAB_EXEC@ +MATLAB_EXT = @MATLAB_EXT@ -# Extra Matlab specific dynamic linking options +#MATLAB_CXX = $(DEFS) @MATLAB_CPPFLAGS@ @MATLAB_CXXFLAGS@ #MATLAB_DLNK = @MATLAB_LDFLAGS@ -MATLAB_MEXSUFFIX = @MATLAB_MEXSUFFIX@ -MATLAB_MEX = @MATLAB_MEX@ +MATLAB_MEX = @MATLAB_MEX@ MATLAB_SCRIPT = $(SRCDIR)$(RUNME) # ---------------------------------------------------------------- @@ -521,14 +521,14 @@ matlab_cpp: $(SRCDIR_SRCS) # ----------------------------------------------------------------- matlab_run: - $(RUNTOOL) "$(MATLAB)" $(MATLABOPTS) -r "try; $(MATLAB_SCRIPT); catch err, fprintf(2,['ERROR: ' err.message '\n']),exit(1), end, exit(0)" $(RUNPIPE) + $(RUNTOOL) "$(MATLAB)" $(MATLAB_OPTS) $(MATLAB_EXEC) "try; $(MATLAB_SCRIPT); catch err, fprintf(2,['ERROR: ' err.message '\n']),exit(1), end, exit(0)" $(RUNPIPE) # ----------------------------------------------------------------- # Version display # ----------------------------------------------------------------- -matlab_version: - "$(MATLAB)" $(MATLABOPTS) -r "disp(version);exit" | tail -n 2 + matlab_version: + "$(MATLAB)" $(MATLAB_OPTS) $(MATLAB_EXEC) "disp(version);exit" | tail -n 2 # ----------------------------------------------------------------- # Cleaning the Matlab examples @@ -537,7 +537,7 @@ matlab_version: matlab_clean: rm -f *_wrap* *~ rm -rf \+* - rm -f *.@OBJEXT@ *@SO@ *$(MATLAB_MEXSUFFIX) + rm -f *.@OBJEXT@ *@SO@ *$(MATLAB_EXT) ################################################################## ##### GUILE ###### diff --git a/configure.ac b/configure.ac index 417450587..1dcc7cc3a 100644 --- a/configure.ac +++ b/configure.ac @@ -1089,7 +1089,7 @@ AC_SUBST(OCTAVE_LDFLAGS) #---------------------------------------------------------------- # Try to detect if there is matlab installed on the system and set the -# MATLAB_HOME, MATLAB and MATLAB_MEXSUFFIX variable +# MATLAB_HOME, MATLAB and MATLAB_EXT variable AC_ARG_WITH([matlab], AS_HELP_STRING([--without-matlab], [Disable Matlab]) AS_HELP_STRING([--with-matlab=path], [specify location of matlab installation for the matlab interface. The "mex" compiler should be in MATLAB_HOME/bin]),[use_matlab=$withval], [use_matlab=yes]) @@ -1140,7 +1140,7 @@ if test x"$MATLAB" != x; then fi fi -MATLAB_MEXSUFFIX= +MATLAB_EXT= if test x"$MATLAB" != x; then AC_MSG_CHECKING([for Matlab mexext command]) AC_PATH_PROG(MATLAB_MEXEXT, [mexext], [], [$MATLAB_HOME/bin$PATH_SEPARATOR$PATH]) @@ -1148,15 +1148,19 @@ if test x"$MATLAB" != x; then AC_MSG_WARN([Cannot find mexext command. Disabling matlab]) MATLAB= else - MATLAB_MEXSUFFIX=`"$MATLAB_MEXEXT"` - AC_MSG_RESULT([matlab mex suffix: $MATLAB_MEXSUFFIX]) + MATLAB_EXT=`"$MATLAB_MEXEXT"` + AC_MSG_RESULT([matlab mex suffix: $MATLAB_EXT]) fi fi +MATLAB_OPTS=-nodisplay -nojvm +MATLAB_EXEC=-r AC_SUBST(MATLAB) +AC_SUBST(MATLAB_OPTS) +AC_SUBST(MATLAB_EXEC) AC_SUBST(MATLAB_HOME) AC_SUBST(MATLAB_MEX) -AC_SUBST(MATLAB_MEXSUFFIX) +AC_SUBST(MATLAB_EXT) # Look for Scilab #---------------------------------------------------------------- |