diff options
| author | Willem Jan Palenstijn <WillemJan.Palenstijn@uantwerpen.be> | 2014-02-26 10:53:45 +0000 |
|---|---|---|
| committer | wpalenst <WillemJan.Palenstijn@uantwerpen.be> | 2014-02-26 10:53:45 +0000 |
| commit | ca005e761452b967c16a5ac073c29e952bf0c4a8 (patch) | |
| tree | 8115b2ec9115639af9a7d359b1da60a0420e2275 | |
| parent | 4ec8ad40294acbaec003fb70bbd61f3f35a5db24 (diff) | |
| download | astra-ca005e761452b967c16a5ac073c29e952bf0c4a8.tar.gz astra-ca005e761452b967c16a5ac073c29e952bf0c4a8.tar.bz2 astra-ca005e761452b967c16a5ac073c29e952bf0c4a8.tar.xz astra-ca005e761452b967c16a5ac073c29e952bf0c4a8.zip | |
Fix build with modern linkers
| -rw-r--r-- | build/linux/Makefile.in | 5 |
1 files changed, 3 insertions, 2 deletions
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) |