[NB: do not backport]

Link shared libraries against $(MATHLIB) automatically, rather than
 requiring it to be specified via EXTRA_LIBS
Add $(FCLIB) as dependency for lib/cairodriver (will need configure.in changes)


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@35565 15284696-431f-4ddb-bdfa-cd5b030d7da7

imagery/i.ortho.photo/lib/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../../..
 
-EXTRA_LIBS=$(GISLIB) $(IMAGERYLIB) $(MATHLIB)
+EXTRA_LIBS=$(GISLIB) $(IMAGERYLIB)
 
 LIB_NAME = $(IORTHO_LIBNAME)
 

include/Make/Shlib.make

@@ -7,8 +7,8 @@ CXXFLAGS += $(SHLIB_CFLAGS)
 LDFLAGS += $(SHLIB_LDFLAGS)
 
 $(SHLIB): $(SHLIB_OBJS)
-	$(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(LIBES) $(EXTRA_LIBS) && \
-	(cd $(ARCH_LIBDIR); ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@))
+	$(SHLIB_LD) -o $@ $(LDFLAGS) $^ $(LIBES) $(EXTRA_LIBS) $(MATHLIB)
+	cd $(ARCH_LIBDIR) && ln -f -s $(notdir $@) $(patsubst %.$(GRASS_VERSION_NUMBER)$(SHLIB_SUFFIX),%$(SHLIB_SUFFIX),$@)
 
 shlib: $(SHLIB)
 

lib/arraystats/Makefile

@@ -1,7 +1,7 @@
 
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB) $(MATHLIB)
+EXTRA_LIBS=$(GISLIB)
 
 LIB_NAME = $(ARRAYSTATS_LIBNAME)
 

lib/cairodriver/Makefile

@@ -1,7 +1,7 @@
 MODULE_TOPDIR = ../..
 
 EXTRA_CFLAGS=-I../driver $(CAIROINC) $(FTINC)
-EXTRA_LIBS=$(DRIVERLIB) $(GISLIB) $(CAIROLIB) $(MATHLIB)
+EXTRA_LIBS=$(DRIVERLIB) $(GISLIB) $(CAIROLIB) $(FCLIB)
 
 # added constant to /include/Make/Grass.make.in
 LIB_NAME = $(CAIRODRIVER_LIBNAME)

lib/cdhc/Makefile

@@ -1,6 +1,5 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(MATHLIB)
 LIB_NAME = $(CDHC_LIBNAME)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make

lib/cluster/Makefile

@@ -4,7 +4,7 @@ LIB_NAME = $(CLUSTER_LIBNAME)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-EXTRA_LIBS = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB) $(MATHLIB)
+EXTRA_LIBS = $(IMAGERYLIB) $(GMATHLIB) $(GISLIB)
 
 default: lib
 

lib/driver/Makefile

@@ -3,7 +3,7 @@ MODULE_TOPDIR = ../..
 include $(MODULE_TOPDIR)/include/Make/Vars.make
 
 EXTRA_CFLAGS=$(FTINC)
-EXTRA_LIBS=$(GISLIB) $(FTLIB) $(ICONVLIB) $(MATHLIB)
+EXTRA_LIBS=$(GISLIB) $(FTLIB) $(ICONVLIB)
 LIB_NAME = $(DRIVER_LIBNAME)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make

lib/gpde/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB) $(G3DLIB) $(MATHLIB)
+EXTRA_LIBS=$(GISLIB) $(G3DLIB)
 LIB_NAME = $(GPDE_LIBNAME)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make

lib/htmldriver/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..
 
 EXTRA_CFLAGS=-I../driver
 
-EXTRA_LIBS=$(DRIVERLIB) $(GISLIB) $(MATHLIB)
+EXTRA_LIBS=$(DRIVERLIB) $(GISLIB)
 LIB_NAME = $(HTMLDRIVER_LIBNAME)
 PGM = htmldriver
 

lib/imagery/Makefile

@@ -5,7 +5,7 @@ LIB_NAME = $(IMAGERY_LIBNAME)
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
-EXTRA_LIBS = $(GMATHLIB) $(GISLIB) $(MATHLIB)
+EXTRA_LIBS = $(GMATHLIB) $(GISLIB)
 
 default: lib
 

lib/nviz/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..
 
 LIB_NAME = $(NVIZ_LIBNAME)
 
-EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(VECTLIB) $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(OGSFLIB) $(XLIB)
+EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(VECTLIB) $(OPENGLLIB) $(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(OGSFLIB)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
@@ -10,10 +10,14 @@ include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 ifeq ($(OPENGL_WINDOWS),1)
 EXTRA_LIBS += -lgdi32
 endif
+ifneq ($(USE_X11),)
+EXTRA_LIBS += $(XLIBPATH) $(XLIB) $(XEXTRALIBS)
+EXTRA_CFLAGS += $(XCFLAGS)
+endif
 
 EXTRA_INC = $(VECT_INC) $(OPENGLINC) $(TIFFINCPATH) $(FFMPEGINCPATH)
 
-EXTRA_CFLAGS = $(VECT_CFLAGS) $(XCFLAGS)
+EXTRA_CFLAGS = $(VECT_CFLAGS)
 
 ifneq ($(USE_OPENGL),)
 default: lib

lib/ogsf/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB) $(BITMAPLIB) $(VECTLIB) $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(SITESLIB) $(G3DLIB) $(MATHLIB)
+EXTRA_LIBS=$(GISLIB) $(BITMAPLIB) $(VECTLIB) $(XLIBPATH) $(OPENGLLIB) $(OPENGLULIB) $(TIFFLIBPATH) $(TIFFLIB) $(FFMPEGLIBPATH) $(FFMPEGLIB) $(SITESLIB) $(G3DLIB)
 
 LIB_NAME = $(OGSF_LIBNAME)
 

lib/proj/Makefile

@@ -5,7 +5,7 @@ LIB_NAME = $(GPROJ_LIBNAME)
 include $(MODULE_TOPDIR)/include/Make/Lib.make 
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
-EXTRA_LIBS=$(GISLIB) $(PROJLIB) $(GDALLIBS) $(MATHLIB)
+EXTRA_LIBS=$(GISLIB) $(PROJLIB) $(GDALLIBS)
 EXTRA_CFLAGS = $(ZLIBINCPATH) $(GDALCFLAGS)
 EXTRA_INC = $(PROJINC)
 

lib/psdriver/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..
 
 EXTRA_CFLAGS=-I../driver
 
-EXTRA_LIBS=$(DRIVERLIB) $(GISLIB) $(MATHLIB)
+EXTRA_LIBS=$(DRIVERLIB) $(GISLIB)
 LIB_NAME = $(PSDRIVER_LIBNAME)
 PGM = psdriver
 

lib/rst/interp_float/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../../..
 
-EXTRA_LIBS=$(GISLIB) $(VECTLIB) $(SITESLIB) $(BITMAPLIB) $(QTREELIB) $(INTERPDATALIB) $(DBMILIB) $(GMATHLIB) $(MATHLIB)
+EXTRA_LIBS=$(GISLIB) $(VECTLIB) $(SITESLIB) $(BITMAPLIB) $(QTREELIB) $(INTERPDATALIB) $(DBMILIB) $(GMATHLIB)
 
 LIB_NAME = $(INTERPFL_LIBNAME)
 

lib/stats/Makefile

@@ -1,7 +1,7 @@
 
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB) $(MATHLIB)
+EXTRA_LIBS=$(GISLIB)
 
 LIB_NAME = $(STATS_LIBNAME)
 

lib/symbol/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../..
 
-EXTRA_LIBS=$(GISLIB) $(MATHLIB)
+EXTRA_LIBS=$(GISLIB)
 
 LIB_NAME = $(SYMB_LIBNAME)
 

lib/vector/Vlib/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../../..
 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(ZLIBINCPATH) $(VECT_CFLAGS)
-EXTRA_LIBS=$(GISLIB) $(DIG2LIB) $(GRAPHLIB) $(RTREELIB) $(LINKMLIB) $(DBMILIB) $(GDALLIBS) $(MATHLIB)
+EXTRA_LIBS=$(GISLIB) $(DIG2LIB) $(GRAPHLIB) $(RTREELIB) $(LINKMLIB) $(DBMILIB) $(GDALLIBS)
 
 LIB_NAME = $(VECTR_LIBNAME)
 DEPENDENCIES =  $(ARCH_INCDIR)/Vect.h $(ARCH_INCDIR)/V_.h \

lib/vector/transform/Makefile

@@ -1,7 +1,6 @@
 
 MODULE_TOPDIR = ../../..
 
-EXTRA_LIBS=$(MATHLIB)
 LIB_NAME = $(TRANS_LIBNAME)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make

lib/vector/vedit/Makefile

@@ -6,7 +6,7 @@ DEPENDENCIES = $(VECTDEP) $(GISDEP)
 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
-EXTRA_LIBS = $(VECTLIB) $(DBMILIB) $(GISLIB) $(MATHLIB)
+EXTRA_LIBS = $(VECTLIB) $(DBMILIB) $(GISLIB)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make

raster/r.li/r.li.daemon/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../../..
 
-EXTRA_LIBS=$(GISLIB) $(MATHLIB)
+EXTRA_LIBS=$(GISLIB) 
 
 LIB_NAME = grass_rli
 PGM = r.li.daemon

raster/simwe/simlib/Makefile

@@ -1,6 +1,6 @@
 MODULE_TOPDIR = ../../..
 
-EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(DBMILIB) $(GMATHLIB) $(LINKMLIB) $(XDRLIB) $(SITESLIB) $(VECTLIB) $(MATHLIB)
+EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(DBMILIB) $(GMATHLIB) $(LINKMLIB) $(XDRLIB) $(SITESLIB) $(VECTLIB)
 DEPENDENCIES = $(GISDEP) $(BITMAPDEP) $(DBMIDEP) $(GMATHDEP) $(LINKMDEP) $(XDRDEP) $(SITESDEP) $(VECTDEP)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)