diff -uNr origsrc/ltfat/oct/Makefile_unix ltfat/oct/Makefile_unix --- origsrc/ltfat/oct/Makefile_unix 2013-11-25 17:12:29.000000000 +0100 +++ ltfat/oct/Makefile_unix 2014-01-19 18:35:13.427632200 +0100 @@ -16,15 +16,19 @@ ifndef BLAS_LIBS BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) endif -ifndef FLIBS -FLIBS := $(shell $(MKOCTFILE) -p FLIBS) +ifndef FFTW3_LIBS +FFTW3_LIBS := $(shell $(MKOCTFILE) -p FFTW3_LIBS) endif -LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS) +ifndef FFTW3F_LIBS +FFTW3F_LIBS := $(shell $(MKOCTFILE) -p FFTW3F_LIBS) +endif + +LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW3F_LIBS) $(FFTW3_LIBS) all: $(OCTS) %.$(EXT): %.cc config.h - $(MKOCTFILE) -strip -Wall -I../thirdparty -I. -I../src -I../src/thirdparty -L../lib -lltfat -lltfatf $< + $(MKOCTFILE) -strip -Wall -I../thirdparty -I. -I../src -I../src/thirdparty -L../lib -lltfat -lltfatf $(LFLAGS) $< clean: rm *.o *.$(EXT) diff -uNr origsrc/ltfat/src/Makefile_unix ltfat/src/Makefile_unix --- origsrc/ltfat/src/Makefile_unix 2013-11-25 17:12:29.000000000 +0100 +++ ltfat/src/Makefile_unix 2014-01-19 15:01:39.960753700 +0100 @@ -4,6 +4,21 @@ CFLAGS=-O3 -fpic -std=c99 -Ithirdparty -fvisibility=hidden +ifndef LAPACK_LIBS +LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS) +endif +ifndef BLAS_LIBS +BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) +endif +ifndef FFTW3F_LIBS +FFTW3F_LIBS := $(shell $(MKOCTFILE) -p FFTW3F_LIBS) +endif +ifndef FFTW3_LIBS +FFTW3_LIBS := $(shell $(MKOCTFILE) -p FFTW3_LIBS) +endif + +LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW3F_LIBS) $(FFTW3_LIBS) + include filedefs.mk toCompile = $(files) $(files_blaslapack) diff -uNr origsrc/ltfat/thirdparty/Playrec/Makefile_unix ltfat/thirdparty/Playrec/Makefile_unix --- origsrc/ltfat/thirdparty/Playrec/Makefile_unix 2013-11-25 17:12:29.000000000 +0100 +++ ltfat/thirdparty/Playrec/Makefile_unix 2014-01-19 14:59:03.768533800 +0100 @@ -17,6 +17,21 @@ PORTAUDIO=portaudio endif +ifndef LAPACK_LIBS +LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS) +endif +ifndef BLAS_LIBS +BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) +endif +ifndef FFTW3F_LIBS +FFTW3F_LIBS := $(shell $(MKOCTFILE) -p FFTW3F_LIBS) +endif +ifndef FFTW3_LIBS +FFTW3_LIBS := $(shell $(MKOCTFILE) -p FFTW3_LIBS) +endif + +LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW3F_LIBS) $(FFTW3_LIBS) + MEXTGT=playrec.$(EXT) MEXSRC=mex_dll_core.c pa_dll_playrec.c LIBS= -L. -L"$(MATLABROOT)/bin/glnxa64" -lmex -lmx -l$(PORTAUDIO) @@ -25,7 +40,7 @@ CC=gcc all: - $(CC) -fPIC -std=c99 -s -O3 -Wall -shared $(INCLUDES) $(MEXSRC) $(LIBS) -o $(MEXTGT) + $(CC) -fPIC -std=c99 -s -O3 -Wall -shared $(INCLUDES) $(MEXSRC) $(LIBS) $(LFLAGS)-o $(MEXTGT) clean: -rm $(MEXTGT) diff -uNr origsrc/ltfat/thirdparty/Playrec/Makefile_unixoct ltfat/thirdparty/Playrec/Makefile_unixoct --- origsrc/ltfat/thirdparty/Playrec/Makefile_unixoct 2013-11-25 17:12:29.000000000 +0100 +++ ltfat/thirdparty/Playrec/Makefile_unixoct 2014-01-19 14:50:55.343848600 +0100 @@ -1,9 +1,23 @@ # Use GNU Make to process this file. MKOCTFILE ?= mkoctfile +ifndef LAPACK_LIBS +LAPACK_LIBS := $(shell $(MKOCTFILE) -p LAPACK_LIBS) +endif +ifndef BLAS_LIBS +BLAS_LIBS := $(shell $(MKOCTFILE) -p BLAS_LIBS) +endif +ifndef FFTW3F_LIBS +FFTW3F_LIBS := $(shell $(MKOCTFILE) -p FFTW3F_LIBS) +endif +ifndef FFTW3_LIBS +FFTW3_LIBS := $(shell $(MKOCTFILE) -p FFTW3_LIBS) +endif + +LFLAGS := $(shell $(MKOCTFILE) -p LFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FFTW3F_LIBS) $(FFTW3_LIBS) all: - $(MKOCTFILE) -mex -Wall -I../../src/thirdparty -I. -lportaudio mex_dll_core.c pa_dll_playrec.c -o playrec.mex + $(MKOCTFILE) -mex -Wall -I../../src/thirdparty -I. mex_dll_core.c pa_dll_playrec.c -o playrec.mex -lportaudio $(LFLAGS) clean: rm *.o *.mex