[Octave-cvsupdate] SF.net SVN: octave:[5562] trunk/octave-forge/main/octcdf

[<aba...@us...>]

Revision: 5562
          http://octave.svn.sourceforge.net/octave/?rev=5562&view=rev
Author:   abarth93
Date:     2009-02-19 20:58:12 +0000 (Thu, 19 Feb 2009)

Log Message:
-----------
pass link option in env var LIBS instead of cmd line options of mkoctfile

Modified Paths:
--------------
    trunk/octave-forge/main/octcdf/DESCRIPTION
    trunk/octave-forge/main/octcdf/src/Makefile

Modified: trunk/octave-forge/main/octcdf/DESCRIPTION
===================================================================
--- trunk/octave-forge/main/octcdf/DESCRIPTION	2009-02-18 21:20:27 UTC (rev 5561)
+++ trunk/octave-forge/main/octcdf/DESCRIPTION	2009-02-19 20:58:12 UTC (rev 5562)
@@ -1,8 +1,8 @@
 Name: octcdf
-Version: 1.0.11
-Date: 2008-08-23
-Author: Alexander Barth <ab...@ma...>
-Maintainer: Alexander Barth <ab...@ma...>
+Version: 1.0.12
+Date: 2009-02-19
+Author: Alexander Barth <bar...@gm...>
+Maintainer: Alexander Barth <bar...@gm...>
 Title: octcdf
 Description: A NetCDF interface for octave
 Depends: octave (>= 2.9.7)

Modified: trunk/octave-forge/main/octcdf/src/Makefile
===================================================================
--- trunk/octave-forge/main/octcdf/src/Makefile	2009-02-18 21:20:27 UTC (rev 5561)
+++ trunk/octave-forge/main/octcdf/src/Makefile	2009-02-19 20:58:12 UTC (rev 5562)
@@ -42,14 +42,13 @@
 TARGETS = $(NCTARGET)
 
 MOFLAGS = $(OCTCDF_CFLAGS)
+MOLIBS = $(shell mkoctfile --print LIBS) $(OCTCDF_LIBS) 
 
 #
 # comment this line out if your octave installation does not have integer types.
 #
 MOFLAGS := $(MOFLAGS) -DHAVE_OCTAVE_INT
 
-EXTRALIBS = $(OCTCDF_LIBS) 
-
 ifeq ($(HAVE_NETCDF),yes)
 all: $(TARGETS)
 else
@@ -62,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)
-	$(MKOCTFILE)  -o $@ $(MOFLAGS) $(OBJECTS) $(EXTRALIBS)
+	LIBS="$(MOLIBS)" $(MKOCTFILE) -o $@ $(MOFLAGS) $(OBJECTS)
 
 %.o:%.cc
 	$(MKOCTFILE) -c $< $(MOFLAGS) $(DEFINES)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.