From ca005e761452b967c16a5ac073c29e952bf0c4a8 Mon Sep 17 00:00:00 2001 From: Willem Jan Palenstijn Date: Wed, 26 Feb 2014 10:53:45 +0000 Subject: Fix build with modern linkers --- build/linux/Makefile.in | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'build/linux') diff --git a/build/linux/Makefile.in b/build/linux/Makefile.in index 943e10c..be50cbf 100644 --- a/build/linux/Makefile.in +++ b/build/linux/Makefile.in @@ -53,7 +53,8 @@ SHELL=@SHELL@ ifeq ($(matlab),yes) MEXFLAGS = -cxx -MEXLDFLAGS='$$LDFLAGS $(LDFLAGS) -L.libs -lut' +MEXLDFLAGS='$$LDFLAGS $(LDFLAGS)' +MEXLIBS ="-L.libs -lut" MEXSUFFIX = @MEXSUFFIX@ MEX = @MEX@ endif @@ -213,7 +214,7 @@ ifeq ($(matlab),yes) mex: $(MATLAB_MEX) %.$(MEXSUFFIX): %.o $(MATLAB_CXX_OBJECTS) libastra.la - $(MEX) LDFLAGS=$(MEXLDFLAGS) $(MEXFLAGS) $(LIBS) -lastra -output $* $*.o $(MATLAB_CXX_OBJECTS) + $(MEX) LDFLAGS=$(MEXLDFLAGS) $(MEXFLAGS) $(LIBS) $(MEXLIBS) -lastra -output $* $*.o $(MATLAB_CXX_OBJECTS) endif libastra.la: $(ALL_OBJECTS) -- cgit v1.2.3