[GRASS-SVN] r40666 - in grass/branches/releasebranch_6_3:
imagery/i.atcorr imagery/i.ortho.photo/libes lib/cdhc
lib/driver lib/gis lib/gpde lib/imagery lib/ogsf lib/proj
lib/rst/interp_float lib/stats lib/symbol lib/vector/Vlib
lib/vector/diglib lib/vector/rtree lib/vector/transform
lib/vector/vedit raster/r.li/r.li.daemon raster/simwe/simlib
svn_grass at osgeo.org
svn_grass at osgeo.org
Tue Jan 26 07:52:11 EST 2010
Author: neteler
Date: 2010-01-26 07:52:09 -0500 (Tue, 26 Jan 2010)
New Revision: 40666
Modified:
grass/branches/releasebranch_6_3/imagery/i.atcorr/Output.h
grass/branches/releasebranch_6_3/imagery/i.ortho.photo/libes/Makefile
grass/branches/releasebranch_6_3/lib/cdhc/Makefile
grass/branches/releasebranch_6_3/lib/driver/Makefile
grass/branches/releasebranch_6_3/lib/gis/Makefile
grass/branches/releasebranch_6_3/lib/gpde/Makefile
grass/branches/releasebranch_6_3/lib/imagery/Makefile
grass/branches/releasebranch_6_3/lib/ogsf/Makefile
grass/branches/releasebranch_6_3/lib/proj/Makefile
grass/branches/releasebranch_6_3/lib/rst/interp_float/Makefile
grass/branches/releasebranch_6_3/lib/stats/Makefile
grass/branches/releasebranch_6_3/lib/symbol/Makefile
grass/branches/releasebranch_6_3/lib/vector/Vlib/Makefile
grass/branches/releasebranch_6_3/lib/vector/diglib/Makefile
grass/branches/releasebranch_6_3/lib/vector/rtree/Makefile
grass/branches/releasebranch_6_3/lib/vector/transform/Makefile
grass/branches/releasebranch_6_3/lib/vector/vedit/Makefile
grass/branches/releasebranch_6_3/raster/r.li/r.li.daemon/Makefile
grass/branches/releasebranch_6_3/raster/simwe/simlib/Makefile
Log:
Makefile fixes
Modified: grass/branches/releasebranch_6_3/imagery/i.atcorr/Output.h
===================================================================
--- grass/branches/releasebranch_6_3/imagery/i.atcorr/Output.h 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/imagery/i.atcorr/Output.h 2010-01-26 12:52:09 UTC (rev 40666)
@@ -1,6 +1,7 @@
#ifndef MY_OUTPUT_H
#define MY_OUTPUT_H
+#include <cstdio>
#include <iostream>
#include <sstream>
#include <string>
Modified: grass/branches/releasebranch_6_3/imagery/i.ortho.photo/libes/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/imagery/i.ortho.photo/libes/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/imagery/i.ortho.photo/libes/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -1,6 +1,6 @@
MODULE_TOPDIR = ../../..
-EXTRA_LIBS=$(GISLIB) $(IMAGERYLIB)
+EXTRA_LIBS=$(GISLIB) $(IMAGERYLIB) $(MATHLIB)
LIB_NAME = $(IORTHO_LIBNAME)
Modified: grass/branches/releasebranch_6_3/lib/cdhc/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/lib/cdhc/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/lib/cdhc/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -1,6 +1,7 @@
MODULE_TOPDIR = ../..
LIB_NAME = $(CDHC_LIBNAME)
+EXTRA_LIBS = $(MATHLIB)
LIB_OBJS = \
dcmp.o \
Modified: grass/branches/releasebranch_6_3/lib/driver/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/lib/driver/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/lib/driver/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -3,7 +3,7 @@
include $(MODULE_TOPDIR)/include/Make/Platform.make
EXTRA_CFLAGS=$(FTINC)
-EXTRA_LIBS=$(GISLIB) $(FTLIB) $(ICONVLIB)
+EXTRA_LIBS=$(GISLIB) $(FTLIB) $(ICONVLIB) $(MATHLIB)
LIB_NAME = $(DRIVER_LIBNAME)
LIB_OBJS =\
Modified: grass/branches/releasebranch_6_3/lib/gis/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/lib/gis/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/lib/gis/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -1,7 +1,7 @@
MODULE_TOPDIR = ../..
LIB_NAME = $(GIS_LIBNAME)
-EXTRA_LIBS = $(XDRLIB) $(DATETIMELIB) $(INTLLIB)
+EXTRA_LIBS = $(XDRLIB) $(DATETIMELIB) $(INTLLIB) $(MATHLIB)
DATASRC = ellipse.table datum.table datumtransform.table FIPS.code state27 state83 projections gui.tcl
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/branches/releasebranch_6_3/lib/gpde/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/lib/gpde/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/lib/gpde/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -1,6 +1,6 @@
MODULE_TOPDIR = ../..
-EXTRA_LIBS=$(GISLIB) $(G3DLIB)
+EXTRA_LIBS=$(GISLIB) $(G3DLIB) $(MATHLIB)
LIB_NAME = $(GPDE_LIBNAME)
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/branches/releasebranch_6_3/lib/imagery/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/lib/imagery/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/lib/imagery/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -4,7 +4,7 @@
include $(MODULE_TOPDIR)/include/Make/Lib.make
-EXTRA_LIBS = $(GMATHLIB) $(GISLIB)
+EXTRA_LIBS = $(GMATHLIB) $(GISLIB) $(MATHLIB)
default: lib
Modified: grass/branches/releasebranch_6_3/lib/ogsf/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/lib/ogsf/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/lib/ogsf/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -1,6 +1,6 @@
MODULE_TOPDIR = ../..
-EXTRA_LIBS=$(GISLIB) $(BITMAPLIB) $(VECTLIB) $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(SITESLIB) $(G3DLIB)
+EXTRA_LIBS=$(GISLIB) $(BITMAPLIB) $(VECTLIB) $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(MATHLIB)
LIB_NAME = $(OGSF_LIBNAME)
Modified: grass/branches/releasebranch_6_3/lib/proj/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/lib/proj/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/lib/proj/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -5,7 +5,7 @@
PACKAGE ="libgproj"
DEFS=-DPACKAGE=\"$(PACKAGE)\"
-EXTRA_LIBS=$(GISLIB) $(PROJLIB) $(GDALLIBS)
+EXTRA_LIBS=$(GISLIB) $(PROJLIB) $(GDALLIBS) $(MATHLIB)
EXTRA_CFLAGS = $(GETHOSTNAME) $(ZLIBINCPATH) $(PICFLAGS) $(GDALCFLAGS) $(DEFS)
EXTRA_INC = $(PROJINC)
Modified: grass/branches/releasebranch_6_3/lib/rst/interp_float/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/lib/rst/interp_float/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/lib/rst/interp_float/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -1,6 +1,6 @@
MODULE_TOPDIR = ../../..
-EXTRA_LIBS=$(GISLIB) $(VECTLIB) $(SITESLIB) $(BITMAPLIB) $(QTREELIB) $(INTERPDATALIB) $(DBMILIB) $(GMATHLIB)
+EXTRA_LIBS=$(GISLIB) $(VECTLIB) $(SITESLIB) $(BITMAPLIB) $(QTREELIB) $(INTERPDATALIB) $(DBMILIB) $(GMATHLIB) $(MATHLIB)
LIB_NAME = $(INTERPFL_LIBNAME)
Modified: grass/branches/releasebranch_6_3/lib/stats/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/lib/stats/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/lib/stats/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -1,7 +1,7 @@
MODULE_TOPDIR = ../..
-EXTRA_LIBS=$(GISLIB)
+EXTRA_LIBS=$(GISLIB) $(MATHLIB)
LIB_NAME = $(STATS_LIBNAME)
Modified: grass/branches/releasebranch_6_3/lib/symbol/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/lib/symbol/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/lib/symbol/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -1,6 +1,6 @@
MODULE_TOPDIR = ../..
-EXTRA_LIBS=$(GISLIB)
+EXTRA_LIBS=$(GISLIB) $(MATHLIB)
LIB_NAME = $(SYMB_LIBNAME)
Modified: grass/branches/releasebranch_6_3/lib/vector/Vlib/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/lib/vector/Vlib/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/lib/vector/Vlib/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -5,8 +5,7 @@
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(GETHOSTNAME) $(ZLIBINCPATH) $(VECT_CFLAGS) $(DEFS)
-EXTRA_LIBS=$(GISLIB) $(DIG2LIB) $(GRAPHLIB) $(RTREELIB) $(LINKMLIB) $(DBMILIB) $(GDALLIBS)
-
+EXTRA_LIBS=$(GISLIB) $(DIG2LIB) $(GRAPHLIB) $(RTREELIB) $(LINKMLIB) $(DBMILIB) $(GDALLIBS) $(MATHLIB)
LIB_NAME = $(VECTR_LIBNAME)
DEPENDENCIES = $(ARCH_INCDIR)/Vect.h $(ARCH_INCDIR)/V_.h \
$(ARCH_INCDIR)/vect/dig_defines.h \
Modified: grass/branches/releasebranch_6_3/lib/vector/diglib/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/lib/vector/diglib/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/lib/vector/diglib/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -1,7 +1,6 @@
MODULE_TOPDIR = ../../..
-EXTRA_LIBS=$(GISLIB) $(RTREELIB)
-
+EXTRA_LIBS=$(GISLIB) $(RTREELIB) $(MATHLIB)
LIB_NAME = $(DIG2_LIBNAME)
LIB_OBJS = \
Modified: grass/branches/releasebranch_6_3/lib/vector/rtree/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/lib/vector/rtree/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/lib/vector/rtree/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -1,6 +1,7 @@
MODULE_TOPDIR = ../../..
LIB_NAME = $(RTREE_LIBNAME)
+EXTRA_LIBS = $(MATHLIB)
LIB_OBJS = card.o \
gammavol.o \
Modified: grass/branches/releasebranch_6_3/lib/vector/transform/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/lib/vector/transform/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/lib/vector/transform/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -2,6 +2,7 @@
MODULE_TOPDIR = ../../..
LIB_NAME = $(TRANS_LIBNAME)
+EXTRA_LIBS = $(MATHLIB)
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/branches/releasebranch_6_3/lib/vector/vedit/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/lib/vector/vedit/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/lib/vector/vedit/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -6,7 +6,7 @@
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
-EXTRA_LIBS = $(VECTLIB) $(DBMILIB) $(GISLIB)
+EXTRA_LIBS = $(VECTLIB) $(DBMILIB) $(GISLIB) $(MATHLIB)
include $(MODULE_TOPDIR)/include/Make/Lib.make
Modified: grass/branches/releasebranch_6_3/raster/r.li/r.li.daemon/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/raster/r.li/r.li.daemon/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/raster/r.li/r.li.daemon/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -1,6 +1,6 @@
MODULE_TOPDIR = ../../..
-EXTRA_LIBS=$(GISLIB)
+EXTRA_LIBS = $(GISLIB) $(MATHLIB)
LIB_NAME = grass_rli
Modified: grass/branches/releasebranch_6_3/raster/simwe/simlib/Makefile
===================================================================
--- grass/branches/releasebranch_6_3/raster/simwe/simlib/Makefile 2010-01-26 12:33:20 UTC (rev 40665)
+++ grass/branches/releasebranch_6_3/raster/simwe/simlib/Makefile 2010-01-26 12:52:09 UTC (rev 40666)
@@ -1,6 +1,6 @@
MODULE_TOPDIR = ../../..
-EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(DBMILIB) $(GMATHLIB) $(LINKMLIB) $(XDRLIB) $(SITESLIB) $(VECTLIB)
+EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(DBMILIB) $(GMATHLIB) $(LINKMLIB) $(XDRLIB) $(SITESLIB) $(VECTLIB) $(MATHLIB)
DEPENDENCIES = $(GISDEP) $(DBMIDEP) $(GMATLIBDEP) $(LINKMDEP) $(XDRDEP) $(SITESDEP) $(VECTDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
More information about the grass-commit
mailing list