[GRASS-SVN] r33855 - in grass/trunk: lib/gmath lib/pngdriver lib/proj lib/raster lib/vector/Vlib vector/v.digit

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Oct 13 01:19:58 EDT 2008


Author: glynn
Date: 2008-10-13 01:19:58 -0400 (Mon, 13 Oct 2008)
New Revision: 33855

Modified:
   grass/trunk/lib/gmath/Makefile
   grass/trunk/lib/pngdriver/Makefile
   grass/trunk/lib/proj/Makefile
   grass/trunk/lib/raster/Makefile
   grass/trunk/lib/vector/Vlib/Makefile
   grass/trunk/vector/v.digit/Makefile
Log:
Remove bogus variables from Makefiles


Modified: grass/trunk/lib/gmath/Makefile
===================================================================
--- grass/trunk/lib/gmath/Makefile	2008-10-13 05:14:55 UTC (rev 33854)
+++ grass/trunk/lib/gmath/Makefile	2008-10-13 05:19:58 UTC (rev 33855)
@@ -2,7 +2,7 @@
 
 EXTRA_LIBS=$(GISLIB) $(FFTWLIB) $(LAPACKLIB) $(BLASLIB)
 
-EXTRA_CFLAGS = $(FFTWINC) $(PICFLAGS)
+EXTRA_CFLAGS = $(FFTWINC)
 
 LIB_NAME = $(GMATH_LIBNAME)
 

Modified: grass/trunk/lib/pngdriver/Makefile
===================================================================
--- grass/trunk/lib/pngdriver/Makefile	2008-10-13 05:14:55 UTC (rev 33854)
+++ grass/trunk/lib/pngdriver/Makefile	2008-10-13 05:19:58 UTC (rev 33855)
@@ -10,7 +10,7 @@
 PGM = pngdriver
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-EXTRA_CFLAGS=$(GETHOSTNAME) $(ZLIBINCPATH) $(PNGINC) -I../driver
+EXTRA_CFLAGS=$(ZLIBINCPATH) $(PNGINC) -I../driver
 
 EXTRA_LIBS=$(DRIVERLIB) $(GISLIB) $(PNGLIB)
 

Modified: grass/trunk/lib/proj/Makefile
===================================================================
--- grass/trunk/lib/proj/Makefile	2008-10-13 05:14:55 UTC (rev 33854)
+++ grass/trunk/lib/proj/Makefile	2008-10-13 05:19:58 UTC (rev 33855)
@@ -6,7 +6,7 @@
 include $(MODULE_TOPDIR)/include/Make/Doxygen.make
 
 EXTRA_LIBS=$(GISLIB) $(PROJLIB) $(GDALLIBS)
-EXTRA_CFLAGS = $(GETHOSTNAME) $(ZLIBINCPATH) $(PICFLAGS) $(GDALCFLAGS) $(DEFS)
+EXTRA_CFLAGS = $(ZLIBINCPATH) $(GDALCFLAGS)
 EXTRA_INC = $(PROJINC)
 
 NAD_TABLES := $(wildcard *.lla)

Modified: grass/trunk/lib/raster/Makefile
===================================================================
--- grass/trunk/lib/raster/Makefile	2008-10-13 05:14:55 UTC (rev 33854)
+++ grass/trunk/lib/raster/Makefile	2008-10-13 05:19:58 UTC (rev 33855)
@@ -2,10 +2,7 @@
 
 include $(MODULE_TOPDIR)/include/Make/Vars.make
 
-PACKAGE ="libraster"
-DEFS=-DPACKAGE=\"$(PACKAGE)\"
-EXTRA_CFLAGS=$(GETHOSTNAME) $(FTINC) -I../driver $(PICFLAGS) $(DEFS)
-
+EXTRA_CFLAGS = -I../driver
 EXTRA_LIBS=$(DRIVERLIB) $(GISLIB) $(PNGDRIVERLIB) $(PSDRIVERLIB) $(HTMLDRIVERLIB)
 LIB_NAME = $(RASTER_LIBNAME)
 

Modified: grass/trunk/lib/vector/Vlib/Makefile
===================================================================
--- grass/trunk/lib/vector/Vlib/Makefile	2008-10-13 05:14:55 UTC (rev 33854)
+++ grass/trunk/lib/vector/Vlib/Makefile	2008-10-13 05:19:58 UTC (rev 33855)
@@ -1,17 +1,14 @@
 MODULE_TOPDIR = ../../..
 
-PACKAGE ="libvect"
-DEFS=-DPACKAGE=\"$(PACKAGE)\"
-
 EXTRA_INC = $(VECT_INC)
-EXTRA_CFLAGS = $(GETHOSTNAME) $(ZLIBINCPATH) $(VECT_CFLAGS) $(DEFS)
+EXTRA_CFLAGS = $(ZLIBINCPATH) $(VECT_CFLAGS)
 EXTRA_LIBS=$(GISLIB) $(DIG2LIB) $(GRAPHLIB) $(RTREELIB) $(LINKMLIB) $(DBMILIB) $(GDALLIBS)
 
 LIB_NAME = $(VECTR_LIBNAME)
 DEPENDENCIES =  $(ARCH_INCDIR)/Vect.h $(ARCH_INCDIR)/V_.h \
 		$(ARCH_INCDIR)/vect/dig_defines.h \
 		$(ARCH_INCDIR)/vect/dig_macros.h $(ARCH_INCDIR)/vect/dig_structs.h \
-               	$(ARCH_INCDIR)/vect/dig_externs.h $(ARCH_INCDIR)/vect/dig_globs.h $(GISDEP)
+		$(ARCH_INCDIR)/vect/dig_externs.h $(ARCH_INCDIR)/vect/dig_globs.h $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 

Modified: grass/trunk/vector/v.digit/Makefile
===================================================================
--- grass/trunk/vector/v.digit/Makefile	2008-10-13 05:14:55 UTC (rev 33854)
+++ grass/trunk/vector/v.digit/Makefile	2008-10-13 05:19:58 UTC (rev 33855)
@@ -8,7 +8,6 @@
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
 EXTRA_CFLAGS = $(XCFLAGS) $(TCLINCDIR) $(TKINCDIR) $(VECT_CFLAGS)
-EXTRA_LDFLAGS = $(DFLAGS) 
 EXTRA_INC = $(VECT_INC)
 
 AUXDIR := $(ARCH_DISTDIR)/etc/v.digit



More information about the grass-commit mailing list