[GRASS-SVN] r33486 - in grass/trunk: display/d.colors display/d.rgb
imagery/i.atcorr include/Make lib/db/sqlp/test ps/ps.map
raster/r.le/r.le.setup/polytocell raster/simwe/simlib
vector/v.mapcalc vector/v.vol.rst
svn_grass at osgeo.org
svn_grass at osgeo.org
Wed Sep 17 11:59:51 EDT 2008
Author: glynn
Date: 2008-09-17 11:59:51 -0400 (Wed, 17 Sep 2008)
New Revision: 33486
Modified:
grass/trunk/display/d.colors/Makefile
grass/trunk/display/d.rgb/Makefile
grass/trunk/imagery/i.atcorr/Makefile
grass/trunk/include/Make/Grass.make
grass/trunk/lib/db/sqlp/test/Makefile
grass/trunk/ps/ps.map/Makefile
grass/trunk/raster/r.le/r.le.setup/polytocell/Makefile
grass/trunk/raster/simwe/simlib/Makefile
grass/trunk/vector/v.mapcalc/Makefile
grass/trunk/vector/v.vol.rst/Makefile
Log:
Fix incorrect variables names
Miscellaneous Makefile cleanup
Remove references to vask, edit libraries
Modified: grass/trunk/display/d.colors/Makefile
===================================================================
--- grass/trunk/display/d.colors/Makefile 2008-09-17 15:09:28 UTC (rev 33485)
+++ grass/trunk/display/d.colors/Makefile 2008-09-17 15:59:51 UTC (rev 33486)
@@ -3,7 +3,7 @@
PGM = d.colors
LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB) $(CURSES)
-DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP) $(CURSESDEP)
+DEPENDENCIES= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/display/d.rgb/Makefile
===================================================================
--- grass/trunk/display/d.rgb/Makefile 2008-09-17 15:09:28 UTC (rev 33485)
+++ grass/trunk/display/d.rgb/Makefile 2008-09-17 15:59:51 UTC (rev 33486)
@@ -3,7 +3,7 @@
PGM = d.rgb
LIBES = $(DISPLAYLIB) $(RASTERLIB) $(GISLIB)
-DEPLIBS= $(DEPD_LIB) $(DEPDISPLAYLIB) $(DEPRASTERLIB) $(DEPGISLIB)
+DEPLIBS= $(DISPLAYDEP) $(RASTERDEP) $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/imagery/i.atcorr/Makefile
===================================================================
--- grass/trunk/imagery/i.atcorr/Makefile 2008-09-17 15:09:28 UTC (rev 33485)
+++ grass/trunk/imagery/i.atcorr/Makefile 2008-09-17 15:59:51 UTC (rev 33486)
@@ -5,7 +5,7 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
LIBES = $(GISLIB)
-DEPENDENCIES = $(DEPGISLIB)
+DEPENDENCIES = $(GISDEP)
LINK = $(CXX)
Modified: grass/trunk/include/Make/Grass.make
===================================================================
--- grass/trunk/include/Make/Grass.make 2008-09-17 15:09:28 UTC (rev 33485)
+++ grass/trunk/include/Make/Grass.make 2008-09-17 15:59:51 UTC (rev 33486)
@@ -116,7 +116,6 @@
ROWIO_LIBNAME = grass_rowio
SEGMENT_LIBNAME = grass_segment
STATS_LIBNAME = grass_stats
-VASK_LIBNAME = grass_vask
XGD_LIBNAME = grass_Xgd
XGI_LIBNAME = grass_Xgi
XPM_LIBNAME = grass_Xpm
@@ -196,7 +195,6 @@
PSDRIVERLIB = -l$(PSDRIVER_LIBNAME) $(DRIVERLIB) $(GISLIB)
CAIRODRIVERLIB= -l$(CAIRODRIVER_LIBNAME) $(DRIVERLIB) $(GISLIB)
HTMLDRIVERLIB = -l$(HTMLDRIVER_LIBNAME) $(DRIVERLIB) $(GISLIB)
-EDITLIB = -l$(EDIT_LIBNAME) $(GISLIB) $(VASKLIB)
G3DLIB = -l$(G3D_LIBNAME) $(GISLIB)
GISLIB = -l$(GIS_LIBNAME) $(DATETIMELIB) $(XDRLIB) $(SOCKLIB) $(INTLLIB)
GMATHLIB = -l$(GMATH_LIBNAME) $(GISLIB)
@@ -215,7 +213,6 @@
ROWIOLIB = -l$(ROWIO_LIBNAME)
SEGMENTLIB = -l$(SEGMENT_LIBNAME) $(GISLIB)
STATSLIB = -l$(STATS_LIBNAME) $(GISLIB)
-VASKLIB = -l$(VASK_LIBNAME)
XGDLIB = -l$(XGD_LIBNAME)
XGILIB = -l$(XGI_LIBNAME)
XPMLIB = -l$(XPM_LIBNAME)
@@ -297,7 +294,6 @@
CAIRODRIVERDEP = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(CAIRODRIVER_LIBNAME)$(LIB_SUFFIX)
HTMLDRIVERDEP = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(HTMLDRIVER_LIBNAME)$(LIB_SUFFIX)
DSPFDEP = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(DSPF_LIBNAME)$(LIB_SUFFIX)
-EDITDEP = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(EDIT_LIBNAME)$(LIB_SUFFIX)
G3DDEP = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(G3D_LIBNAME)$(LIB_SUFFIX)
GISDEP = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(GIS_LIBNAME)$(LIB_SUFFIX)
GMATHDEP = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(GMATH_LIBNAME)$(LIB_SUFFIX)
@@ -313,7 +309,6 @@
ROWIODEP = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(ROWIO_LIBNAME)$(LIB_SUFFIX)
SEGMENTDEP = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(SEGMENT_LIBNAME)$(LIB_SUFFIX)
STATSDEP = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(STATS_LIBNAME)$(LIB_SUFFIX)
-VASKDEP = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(VASK_LIBNAME)$(LIB_SUFFIX)
XGDDEP = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(XGD_LIBNAME)$(LIB_SUFFIX)
XGIDEP = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(XGI_LIBNAME)$(LIB_SUFFIX)
XPMDEP = $(ARCH_LIBDIR)/$(LIB_PREFIX)$(XPM_LIBNAME)$(LIB_SUFFIX)
Modified: grass/trunk/lib/db/sqlp/test/Makefile
===================================================================
--- grass/trunk/lib/db/sqlp/test/Makefile 2008-09-17 15:09:28 UTC (rev 33485)
+++ grass/trunk/lib/db/sqlp/test/Makefile 2008-09-17 15:59:51 UTC (rev 33486)
@@ -3,7 +3,7 @@
include $(MODULE_TOPDIR)/include/Make/Other.make
-LIBES = $(SQLPLIB) $(DBMILIB) $(GISLIB) $(LEXLIB)
+LIBES = $(SQLPLIB) $(DBMILIB) $(GISLIB) $(MATHLIB) $(ZLIBLIBPATH) $(ZLIB)
EXTRA_CLEAN_FILES = sqlptest
@@ -11,5 +11,5 @@
sqlptest: sqlptest.c
- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ sqlptest.c $(LIBES) -lm -lz
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< $(LIBES)
Modified: grass/trunk/ps/ps.map/Makefile
===================================================================
--- grass/trunk/ps/ps.map/Makefile 2008-09-17 15:09:28 UTC (rev 33485)
+++ grass/trunk/ps/ps.map/Makefile 2008-09-17 15:59:51 UTC (rev 33486)
@@ -4,22 +4,25 @@
PROLOG=$(ETC)/paint/prolog.ps
LIBES = $(VECTLIB) $(GPROJLIB) $(SYMBLIB) $(GISLIB) $(DATETIMELIB) $(IMAGERYLIB) $(GMATHLIB)
-DEPENDENCIES = $(VECTDEP) $(SYMBDEP) $(GISDEP) $(DATETIDEP) $(IMAGERYDEP) $(GMATHDEP) \
- colortable.h group.h labels.h map_info.h ps_info.h vector.h \
- comment.h header.h local_proto.h
+DEPENDENCIES = $(VECTDEP) $(SYMBDEP) $(GISDEP) $(DATETIMEDEP) $(IMAGERYDEP) $(GMATHDEP)
EXTRA_INC = $(VECT_INC) $(PROJINC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
-
+
include $(MODULE_TOPDIR)/include/Make/Module.make
+SRCPAT := $(wildcard patterns/*.eps)
+DSTPAT := $(patsubst patterns/%.eps,$(ETC)/paint/patterns/%.eps,$(SRCPAT))
+
default: cmd $(PROLOG) patt
$(PROLOG): prolog.ps
$(MKDIR) $(ETC)/paint
- $(INSTALL_DATA) prolog.ps $(PROLOG)
+ $(INSTALL_DATA) $< $@
patt:
$(MKDIR) $(ETC)/paint/patterns/
- $(INSTALL_DATA) patterns/*.eps $(ETC)/paint/patterns/
+ $(MAKE) $(DSTPAT)
+$(ETC)/paint/patterns/%.eps: patterns/%.eps
+ $(INSTALL_DATA) $< $@
Modified: grass/trunk/raster/r.le/r.le.setup/polytocell/Makefile
===================================================================
--- grass/trunk/raster/r.le/r.le.setup/polytocell/Makefile 2008-09-17 15:09:28 UTC (rev 33485)
+++ grass/trunk/raster/r.le/r.le.setup/polytocell/Makefile 2008-09-17 15:59:51 UTC (rev 33486)
@@ -10,7 +10,7 @@
$(OBJDIR)/yadjust.o
LIBES = $(GISLIB)
-DEPENDENCIES= $(DEPGISLIB)
+DEPENDENCIES= $(GISDEP)
include $(MODULE_TOPDIR)/include/Make/Module.make
Modified: grass/trunk/raster/simwe/simlib/Makefile
===================================================================
--- grass/trunk/raster/simwe/simlib/Makefile 2008-09-17 15:09:28 UTC (rev 33485)
+++ grass/trunk/raster/simwe/simlib/Makefile 2008-09-17 15:59:51 UTC (rev 33486)
@@ -1,7 +1,7 @@
MODULE_TOPDIR = ../../..
EXTRA_LIBS = $(GISLIB) $(BITMAPLIB) $(DBMILIB) $(GMATHLIB) $(LINKMLIB) $(XDRLIB) $(SITESLIB) $(VECTLIB)
-DEPENDENCIES = $(GISDEP) $(DBMIDEP) $(GMATLIBDEP) $(LINKMDEP) $(XDRDEP) $(SITESDEP) $(VECTDEP)
+DEPENDENCIES = $(GISDEP) $(BITMAPDEP) $(DBMIDEP) $(GMATHDEP) $(LINKMDEP) $(XDRDEP) $(SITESDEP) $(VECTDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
Modified: grass/trunk/vector/v.mapcalc/Makefile
===================================================================
--- grass/trunk/vector/v.mapcalc/Makefile 2008-09-17 15:09:28 UTC (rev 33485)
+++ grass/trunk/vector/v.mapcalc/Makefile 2008-09-17 15:59:51 UTC (rev 33486)
@@ -1,46 +1,12 @@
-CC = gcc
-#CFLAGS = -g -Wall -Werror -rdynamic
-CFLAGS = -O2 -Wall -Werror -rdynamic
-LDFLAGS = -ldl -lm #-lefence
-YACC = bison
-#YACC = bison -t
-YACCFLAGS = -d
+MODULE_TOPDIR = ../..
-all: v.mapcalc
+PGM = v.mapcalc
-v.mapcalc: mapcalc.o yylex.o v.mapcalc.o number.o vector.o map.o any.o \
- plugin.o list.o
- $(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+LIBES = $(MATHLIB)
+DEPENDENCIES =
-v.mapcalc.o: v.mapcalc.tab.c
- $(CC) $(CFLAGS) -o $@ -c $<
+include $(MODULE_TOPDIR)/include/Make/Module.make
-v.mapcalc.tab.c v.mapcalc.tab.h: v.mapcalc.y
- $(YACC) $(YACCFLAGS) $<
+default: cmd
-mapcalc.o: mapcalc.c list.h mapcalc.h number.h map.h plugin.h vector.h any.h
- $(CC) $(CFLAGS) -o $@ -c $<
-
-number.o: number.c list.h mapcalc.h
- $(CC) $(CFLAGS) -o $@ -c $<
-
-map.o: map.c list.h mapcalc.h map.h
- $(CC) $(CFLAGS) -o $@ -c $<
-
-any.o: any.c list.h mapcalc.h any.h
- $(CC) $(CFLAGS) -o $@ -c $<
-
-vector.o: vector.c list.h mapcalc.h vector.h
- $(CC) $(CFLAGS) -o $@ -c $<
-
-plugin.o: plugin.c list.h mapcalc.h
- $(CC) $(CFLAGS) -o $@ -c $<
-
-yylex.o: yylex.c mapcalc.h yylex.h v.mapcalc.tab.h
- $(CC) $(CFLAGS) -o $@ -c $<
-
-list.o: list.c list.h
- $(CC) $(CFLAGS) -o $@ -c $<
-
-clean:
- rm -f *~ .*~ *.o v.mapcalc.tab.[ch] v.mapcalc
+.INTERMEDIATE: v.mapcalc.tab.c v.mapcalc.tab.h v.mapcalc.output
Modified: grass/trunk/vector/v.vol.rst/Makefile
===================================================================
--- grass/trunk/vector/v.vol.rst/Makefile 2008-09-17 15:09:28 UTC (rev 33485)
+++ grass/trunk/vector/v.vol.rst/Makefile 2008-09-17 15:59:51 UTC (rev 33486)
@@ -2,8 +2,8 @@
PGM = v.vol.rst
-LIBES=$(G3DLIB) $(SITESLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB) $(BITMAPLIB) $(LINKMLIB)
-DEPENDENCIES=$(G3DLIBDEP) $(VECTDEP) $(GISLIBDEP) $(DATETIMELIBDEP) $(BITMAPLIBDEP) $(LINKMLIBDEP)
+LIBES = $(G3DLIB) $(SITESLIB) $(VECTLIB) $(GISLIB) $(DATETIMELIB) $(BITMAPLIB) $(LINKMLIB)
+DEPENDENCIES = $(G3DDEP) $(SITESDEP) $(VECTDEP) $(GISDEP) $(DATETIMEDEP) $(BITMAPDEP) $(LINKMDEP)
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
More information about the grass-commit
mailing list