Build system for MEX/Octave: use Octave's LDFLAGS in the configure script
This will facilitate the detection of UMFPACK under Windowstime-shift
parent
aa73a3f5ed
commit
513ae741e3
|
@ -30,6 +30,7 @@ if test "x$MKOCTFILE" != "x"; then
|
||||||
CFLAGS=`$MKOCTFILE -p CFLAGS`
|
CFLAGS=`$MKOCTFILE -p CFLAGS`
|
||||||
FFLAGS=`$MKOCTFILE -p FFLAGS`
|
FFLAGS=`$MKOCTFILE -p FFLAGS`
|
||||||
CXXFLAGS=`$MKOCTFILE -p CXXFLAGS`
|
CXXFLAGS=`$MKOCTFILE -p CXXFLAGS`
|
||||||
|
LDFLAGS="`$MKOCTFILE -p LFLAGS` `$MKOCTFILE -p LDFLAGS`"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
CFLAGS="$CFLAGS -Wall -Wno-parentheses"
|
CFLAGS="$CFLAGS -Wall -Wno-parentheses"
|
||||||
|
|
|
@ -8,10 +8,7 @@ DEFS += -DMEXEXT=\".mex\"
|
||||||
AM_CFLAGS = $(shell $(MKOCTFILE) -p CPICFLAG)
|
AM_CFLAGS = $(shell $(MKOCTFILE) -p CPICFLAG)
|
||||||
AM_FFLAGS = $(shell $(MKOCTFILE) -p FPICFLAG)
|
AM_FFLAGS = $(shell $(MKOCTFILE) -p FPICFLAG)
|
||||||
AM_CXXFLAGS = $(shell $(MKOCTFILE) -p CXXPICFLAG)
|
AM_CXXFLAGS = $(shell $(MKOCTFILE) -p CXXPICFLAG)
|
||||||
|
|
||||||
AM_LDFLAGS = $(shell $(MKOCTFILE) -p DL_LDFLAGS)
|
AM_LDFLAGS = $(shell $(MKOCTFILE) -p DL_LDFLAGS)
|
||||||
AM_LDFLAGS += $(shell $(MKOCTFILE) -p LFLAGS)
|
|
||||||
AM_LDFLAGS += $(shell $(MKOCTFILE) -p LDFLAGS)
|
|
||||||
|
|
||||||
LIBS += $(shell $(MKOCTFILE) -p OCTAVE_LIBS)
|
LIBS += $(shell $(MKOCTFILE) -p OCTAVE_LIBS)
|
||||||
LIBS += $(shell $(MKOCTFILE) -p BLAS_LIBS)
|
LIBS += $(shell $(MKOCTFILE) -p BLAS_LIBS)
|
||||||
|
|
Loading…
Reference in New Issue