Mercurial > forge
changeset 9313:98859fc3b614 octave-forge
LIBS is no longer passed through mkoctfile; use library option instead
| author | abarth93 |
|---|---|
| date | Fri, 06 Jan 2012 12:54:29 +0000 |
| parents | e98613d4c241 |
| children | 00980855eafa |
| files | main/octcdf/src/Makefile |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/main/octcdf/src/Makefile Fri Jan 06 12:33:41 2012 +0000 +++ b/main/octcdf/src/Makefile Fri Jan 06 12:54:29 2012 +0000 @@ -42,7 +42,7 @@ TARGETS = $(NCTARGET) MOFLAGS = $(OCTCDF_CFLAGS) -MOLIBS = $(shell mkoctfile --print LIBS) $(OCTCDF_LIBS) +MOLIBS = $(OCTCDF_LIBS) # # comment this line out if your octave installation does not have integer types. @@ -61,7 +61,7 @@ ov-netcdf.o ov-ncfile.o ov-ncvar.o ov-ncatt.o ov-ncdim.o: ov-netcdf.h ov-ncfile.h ov-ncvar.h ov-ncatt.h ov-ncdim.h $(NCTARGET) : $(OBJECTS) - LIBS="$(MOLIBS)" $(MKOCTFILE) -o $@ $(MOFLAGS) $(OBJECTS) + $(MKOCTFILE) -o $@ $(MOFLAGS) $(OBJECTS) $(MOLIBS) %.o:%.cc $(MKOCTFILE) -c $< $(MOFLAGS) $(DEFINES)