[GRASS-SVN] r33712 - in grass/branches/develbranch_6/general: g.mlist g.mremove

[svn_grass at osgeo.org]

Author: neteler
Date: 2008-10-07 04:06:22 -0400 (Tue, 07 Oct 2008)
New Revision: 33712

Modified:
   grass/branches/develbranch_6/general/g.mlist/Makefile
   grass/branches/develbranch_6/general/g.mremove/Makefile
Log:
pkelly: Regex include path and library (merge from trunk, r33699)

Modified: grass/branches/develbranch_6/general/g.mlist/Makefile
===================================================================
--- grass/branches/develbranch_6/general/g.mlist/Makefile	2008-10-07 06:53:43 UTC (rev 33711)
+++ grass/branches/develbranch_6/general/g.mlist/Makefile	2008-10-07 08:06:22 UTC (rev 33712)
@@ -2,7 +2,8 @@
 
 PGM = g.mlist
 
-LIBES = $(GISLIB)
+EXTRA_INC = $(REGEXINCPATH)
+LIBES = $(GISLIB) $(REGEXLIBPATH) $(REGEXLIB)
 DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make

Modified: grass/branches/develbranch_6/general/g.mremove/Makefile
===================================================================
--- grass/branches/develbranch_6/general/g.mremove/Makefile	2008-10-07 06:53:43 UTC (rev 33711)
+++ grass/branches/develbranch_6/general/g.mremove/Makefile	2008-10-07 08:06:22 UTC (rev 33712)
@@ -2,9 +2,9 @@
 
 PGM = g.mremove
 
-LIBES = $(GISLIB) $(VECTLIB) $(G3DLIB)
+LIBES = $(GISLIB) $(VECTLIB) $(G3DLIB) $(REGEXLIBPATH) $(REGEXLIB)
 DEPENDENCIES = $(GISDEP) $(VECTDEP) $(G3DDEP)
-EXTRA_INC = $(VECT_INC)
+EXTRA_INC = $(VECT_INC) $(REGEXINCPATH)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make