浏览代码

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.


git-svn-id: https://svn.osgeo.org/grass/grass/trunk@70334 15284696-431f-4ddb-bdfa-cd5b030d7da7
Vaclav Petras 8 年之前
父节点
当前提交
efe81a1397
共有 1 个文件被更改,包括 2 次插入4 次删除
  1. 2 4
      lib/rst/interp_float/Makefile

+ 2 - 4
lib/rst/interp_float/Makefile

@@ -1,13 +1,12 @@
 MODULE_TOPDIR = ../../..
 MODULE_TOPDIR = ../../..
 
 
-
 LIB = INTERPFL
 LIB = INTERPFL
 
 
-DEPENDENCIES = $(GISDEP) $(RASTERDEP)
+DEPENDENCIES = $(GISDEP) $(RASTERDEP) $(VECTORDEP) $(GMATHDEP) $(DBMIDEP) $(BITMAPDEP) $(QTREEDEP) $(INTERPDATADEP)
 
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 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_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS) $(OMPCFLAGS)
 EXTRA_CFLAGS = $(VECT_CFLAGS) $(OMPCFLAGS)
 EXTRA_LIBS = $(OMPLIB)
 EXTRA_LIBS = $(OMPLIB)
@@ -17,4 +16,3 @@ default: $(ARCH_INCDIR)/interpf.h
 
 
 $(ARCH_INCDIR)/interpf.h: interpf.h
 $(ARCH_INCDIR)/interpf.h: interpf.h
 	$(INSTALL_DATA) interpf.h $(ARCH_INCDIR)/interpf.h
 	$(INSTALL_DATA) interpf.h $(ARCH_INCDIR)/interpf.h
-