[GRASS-SVN] r70334 - grass/trunk/lib/rst/interp_float

svn_grass at osgeo.org svn_grass at osgeo.org
Tue Jan 10 12:07:13 PST 2017


Author: wenzeslaus
Date: 2017-01-10 12:07:13 -0800 (Tue, 10 Jan 2017)
New Revision: 70334

Modified:
   grass/trunk/lib/rst/interp_float/Makefile
Log:
rst: add raster and gmath to libraries

Also reorder libraries to more common order.
Add dependencies synced to libs.
Leave math in libs as in other modules
although it likely should be in extra or just get it from link command.

This is meant to fix compilation on Mac where some of the libs are
in EXTRA_LIBS which is reasigned.


Modified: grass/trunk/lib/rst/interp_float/Makefile
===================================================================
--- grass/trunk/lib/rst/interp_float/Makefile	2017-01-10 19:51:10 UTC (rev 70333)
+++ grass/trunk/lib/rst/interp_float/Makefile	2017-01-10 20:07:13 UTC (rev 70334)
@@ -1,13 +1,12 @@
 MODULE_TOPDIR = ../../..
 
-
 LIB = INTERPFL
 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(VECTORDEP) $(GMATHDEP) $(DBMIDEP) $(BITMAPDEP) $(QTREEDEP) $(INTERPDATADEP)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-LIBES = $(VECTORLIB) $(INTERPDATALIB) $(DBMILIB) $(GISLIB) $(MATHLIB) $(QTREELIB) $(BITMAPLIB)
+LIBES = $(GISLIB) $(RASTERLIB) $(VECTORLIB) $(GMATHLIB) $(DBMILIB) $(BITMAPLIB) $(QTREELIB) $(INTERPDATALIB) $(MATHLIB)
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS) $(OMPCFLAGS)
 EXTRA_LIBS = $(OMPLIB)
@@ -17,4 +16,3 @@
 
 $(ARCH_INCDIR)/interpf.h: interpf.h
 	$(INSTALL_DATA) interpf.h $(ARCH_INCDIR)/interpf.h
-



More information about the grass-commit mailing list