Browse Source

Add (some) missing dependencies upon iconv, regex, XDR libraries

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@38907 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 15 years ago
parent
commit
4217867d62
3 changed files with 4 additions and 4 deletions
  1. 1 1
      general/g.mlist/Makefile
  2. 1 1
      general/g.mremove/Makefile
  3. 2 2
      include/Make/Grass.make

+ 1 - 1
general/g.mlist/Makefile

@@ -3,7 +3,7 @@ MODULE_TOPDIR = ../..
 PGM = g.mlist
 
 EXTRA_INC = $(REGEXINCPATH)
-LIBES = $(MANAGELIB) $(GISLIB)
+LIBES = $(MANAGELIB) $(GISLIB) $(REGEXLIBPATH) $(REGEXLIB)
 DEPENDENCIES = $(MANAGEDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

+ 1 - 1
general/g.mremove/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..
 
 PGM = g.mremove
 
-LIBES = $(MANAGELIB) $(RASTERLIB) $(GISLIB)
+LIBES = $(MANAGELIB) $(RASTERLIB) $(GISLIB) $(REGEXLIBPATH) $(REGEXLIB)
 DEPENDENCIES = $(MANAGEDEP) $(RASTERDEP) $(GISDEP)
 EXTRA_INC = $(VECT_INC) $(REGEXINCPATH)
 EXTRA_CFLAGS = $(VECT_CFLAGS)

+ 2 - 2
include/Make/Grass.make

@@ -180,7 +180,7 @@ libs = \
 
 ARRAYSTATSDEPS   = $(GISLIB) $(MATHLIB)
 BITMAPDEPS       = $(LINKMLIB)
-CAIRODRIVERDEPS  = $(DRIVERLIB) $(GISLIB) $(CAIROLIB) $(FCLIB)
+CAIRODRIVERDEPS  = $(DRIVERLIB) $(GISLIB) $(CAIROLIB) $(FCLIB) $(ICONVLIB)
 CDHCDEPS         = $(MATHLIB)
 CLUSTERDEPS      = $(IMAGERYLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)
 DBMIBASEDEPS     = $(GISLIB)
@@ -192,7 +192,7 @@ DISPLAYDEPS      = $(HTMLDRIVERLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) $(DRIVERLIB)
 DRIVERDEPS       = $(GISLIB) $(FTLIB) $(ICONVLIB) $(MATHLIB)
 DSPFDEPS         = $(GISLIB)
 FORMDEPS         = $(DBMILIB) $(GISLIB)
-G3DDEPS          = $(RASTERLIB) $(GISLIB)
+G3DDEPS          = $(RASTERLIB) $(GISLIB) $(XDRLIB)
 GISDEPS          = $(DATETIMELIB) $(ZLIBLIBPATH) $(ZLIB) $(INTLLIB) $(PTHREADLIBPATH) $(PTHREADLIB) $(MATHLIB)
 GMATHDEPS        = $(GISLIB) $(FFTWLIB) $(LAPACKLIB) $(BLASLIB)
 GPDEDEPS         = $(G3DLIB) $(RASTERLIB) $(GISLIB) $(MATHLIB)