Browse Source

Remove bogus variables from Makefiles

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@33855 15284696-431f-4ddb-bdfa-cd5b030d7da7
Glynn Clements 16 năm trước cách đây
mục cha
commit
faebd9885b

+ 1 - 1
lib/gmath/Makefile

@@ -2,7 +2,7 @@ MODULE_TOPDIR = ../..
 
 EXTRA_LIBS=$(GISLIB) $(FFTWLIB) $(LAPACKLIB) $(BLASLIB)
 
-EXTRA_CFLAGS = $(FFTWINC) $(PICFLAGS)
+EXTRA_CFLAGS = $(FFTWINC)
 
 LIB_NAME = $(GMATH_LIBNAME)
 

+ 1 - 1
lib/pngdriver/Makefile

@@ -10,7 +10,7 @@ LIB_NAME = $(PNGDRIVER_LIBNAME)
 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)
 

+ 1 - 1
lib/proj/Makefile

@@ -6,7 +6,7 @@ include $(MODULE_TOPDIR)/include/Make/Lib.make
 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)

+ 1 - 4
lib/raster/Makefile

@@ -2,10 +2,7 @@ MODULE_TOPDIR = ../..
 
 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)
 

+ 2 - 5
lib/vector/Vlib/Makefile

@@ -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
 

+ 0 - 1
vector/v.digit/Makefile

@@ -8,7 +8,6 @@ DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(VECTDEP) $(GISDEP)
 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