[GRASS-SVN] r34329 - in grass/trunk: general/g.mlist
general/g.mremove gui/wxpython gui/wxpython/nviz
gui/wxpython/vdigit imagery imagery/i.fft imagery/i.ifft
imagery/i.zc include/Make lib/cairodriver lib/iostream
lib/nviz lib/ogsf raster raster/r.external raster/r.in.gdal
raster/r.out.gdal raster/r.out.png raster/r.out.tiff
raster/r.surf.fractal raster/r.terraflow vector
vector/v.digit vector/v.external vector/v.in.dwg
vector/v.in.ogr vector/v.out.ogr visualization
visualization/nviz visualization/nviz2/cmd
visualization/xganim visualization/ximgview
svn_grass at osgeo.org
svn_grass at osgeo.org
Sun Nov 16 06:54:35 EST 2008
Author: glynn
Date: 2008-11-16 06:54:34 -0500 (Sun, 16 Nov 2008)
New Revision: 34329
Modified:
grass/trunk/general/g.mlist/Makefile
grass/trunk/general/g.mremove/Makefile
grass/trunk/gui/wxpython/Makefile
grass/trunk/gui/wxpython/nviz/Makefile
grass/trunk/gui/wxpython/vdigit/Makefile
grass/trunk/imagery/Makefile
grass/trunk/imagery/i.fft/Makefile
grass/trunk/imagery/i.ifft/Makefile
grass/trunk/imagery/i.zc/Makefile
grass/trunk/include/Make/Rules.make
grass/trunk/lib/cairodriver/Makefile
grass/trunk/lib/iostream/Makefile
grass/trunk/lib/nviz/Makefile
grass/trunk/lib/ogsf/Makefile
grass/trunk/raster/Makefile
grass/trunk/raster/r.external/Makefile
grass/trunk/raster/r.in.gdal/Makefile
grass/trunk/raster/r.out.gdal/Makefile
grass/trunk/raster/r.out.png/Makefile
grass/trunk/raster/r.out.tiff/Makefile
grass/trunk/raster/r.surf.fractal/Makefile
grass/trunk/raster/r.terraflow/Makefile
grass/trunk/vector/Makefile
grass/trunk/vector/v.digit/Makefile
grass/trunk/vector/v.external/Makefile
grass/trunk/vector/v.in.dwg/Makefile
grass/trunk/vector/v.in.ogr/Makefile
grass/trunk/vector/v.out.ogr/Makefile
grass/trunk/visualization/Makefile
grass/trunk/visualization/nviz/Makefile
grass/trunk/visualization/nviz2/cmd/Makefile
grass/trunk/visualization/xganim/Makefile
grass/trunk/visualization/ximgview/Makefile
Log:
Clean up handling of optional components
Modified: grass/trunk/general/g.mlist/Makefile
===================================================================
--- grass/trunk/general/g.mlist/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/general/g.mlist/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -10,6 +10,4 @@
ifneq ($(USE_REGEX),)
default: cmd
-else
-default:
endif
Modified: grass/trunk/general/g.mremove/Makefile
===================================================================
--- grass/trunk/general/g.mremove/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/general/g.mremove/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -11,6 +11,4 @@
ifneq ($(USE_REGEX),)
default: cmd
-else
-default:
endif
Modified: grass/trunk/gui/wxpython/Makefile
===================================================================
--- grass/trunk/gui/wxpython/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/gui/wxpython/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -1,22 +1,7 @@
MODULE_TOPDIR = ../..
-SUBDIRS = docs scripts
+SUBDIRS = docs scripts vdigit nviz
-include $(MODULE_TOPDIR)/include/Make/Vars.make
-
-#compile if wxWidgets, Python, CXX present
-ifneq ($(USE_WXWIDGETS),)
- ifneq ($(USE_PYTHON),)
- ifneq ($(strip $(CXX)),)
- SUBDIRS += vdigit
- #compile if OpenGL present
- ifneq ($(strip $(OPENGLLIB)),)
- SUBDIRS += nviz
- endif
- endif
- endif
-endif
-
include $(MODULE_TOPDIR)/include/Make/Dir.make
ETCDIR = $(ETC)/wxpython
Modified: grass/trunk/gui/wxpython/nviz/Makefile
===================================================================
--- grass/trunk/gui/wxpython/nviz/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/gui/wxpython/nviz/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -22,7 +22,15 @@
EXTRA_CLEAN_FILES = $(SHLIB) $(LIB_NAME).i $(LIB_NAME).py $(LIB_NAME)_wrap.cpp
+ifneq ($(USE_WXWIDGETS),)
+ifneq ($(USE_PYTHON),)
+ifneq ($(strip $(CXX)),)
+ifneq ($(strip $(OPENGLLIB)),)
default: install_nviz
+endif
+endif
+endif
+endif
$(LIB_NAME).i: nviz.i nviz_types.i nviz.h
cat nviz.i nviz_types.i > $(LIB_NAME).i
Modified: grass/trunk/gui/wxpython/vdigit/Makefile
===================================================================
--- grass/trunk/gui/wxpython/vdigit/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/gui/wxpython/vdigit/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -22,7 +22,13 @@
EXTRA_CLEAN_FILES = $(SHLIB) $(LIB_NAME).i $(LIB_NAME).py $(LIB_NAME)_wrap.cpp
+ifneq ($(USE_WXWIDGETS),)
+ifneq ($(USE_PYTHON),)
+ifneq ($(strip $(CXX)),)
default: install_vdigit
+endif
+endif
+endif
$(LIB_NAME).i: digit.i dig_types.i driver.h digit.h
cat digit.i dig_types.i > $(LIB_NAME).i
Modified: grass/trunk/imagery/Makefile
===================================================================
--- grass/trunk/imagery/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/imagery/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -1,7 +1,5 @@
MODULE_TOPDIR = ..
-include $(MODULE_TOPDIR)/include/Make/Vars.make
-
SUBDIRS = \
i.albedo \
i.atcorr \
@@ -22,15 +20,11 @@
i.sunhours \
i.target \
i.pca \
- i.vi
+ i.vi \
+ i.fft \
+ i.ifft \
+ i.zc
-FFTWBASED = i.fft i.ifft i.zc
-
-#compile if FFTW present:
-ifneq ($(strip $(FFTWLIB)),)
- SUBDIRS += $(FFTWBASED)
-endif
-
PGM = imageryintro
include $(MODULE_TOPDIR)/include/Make/Dir.make
Modified: grass/trunk/imagery/i.fft/Makefile
===================================================================
--- grass/trunk/imagery/i.fft/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/imagery/i.fft/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -7,4 +7,6 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
+ifneq ($(strip $(FFTWLIB)),)
default: cmd
+endif
Modified: grass/trunk/imagery/i.ifft/Makefile
===================================================================
--- grass/trunk/imagery/i.ifft/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/imagery/i.ifft/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -7,4 +7,6 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
+ifneq ($(strip $(FFTWLIB)),)
default: cmd
+endif
Modified: grass/trunk/imagery/i.zc/Makefile
===================================================================
--- grass/trunk/imagery/i.zc/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/imagery/i.zc/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -7,4 +7,6 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
+ifneq ($(strip $(FFTWLIB)),)
default: cmd
+endif
Modified: grass/trunk/include/Make/Rules.make
===================================================================
--- grass/trunk/include/Make/Rules.make 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/include/Make/Rules.make 2008-11-16 11:54:34 UTC (rev 34329)
@@ -10,6 +10,8 @@
pre: $(ARCH_DIRS)
+default:
+
$(ARCH_DIRS):
$(MKDIR) $@
Modified: grass/trunk/lib/cairodriver/Makefile
===================================================================
--- grass/trunk/lib/cairodriver/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/lib/cairodriver/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -11,7 +11,5 @@
ifneq ($(USE_CAIRO),)
default: lib
-else
-default:
endif
Modified: grass/trunk/lib/iostream/Makefile
===================================================================
--- grass/trunk/lib/iostream/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/lib/iostream/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -10,6 +10,4 @@
ifneq ($(strip $(CXX)),)
default: stlib
-else
-default:
endif
Modified: grass/trunk/lib/nviz/Makefile
===================================================================
--- grass/trunk/lib/nviz/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/lib/nviz/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -17,8 +17,6 @@
ifneq ($(USE_OPENGL),)
default: lib
-else
-default:
endif
# doxygen
Modified: grass/trunk/lib/ogsf/Makefile
===================================================================
--- grass/trunk/lib/ogsf/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/lib/ogsf/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -12,8 +12,6 @@
ifneq ($(USE_OPENGL),)
default: lib
-else
-default:
endif
#doxygen:
Modified: grass/trunk/raster/Makefile
===================================================================
--- grass/trunk/raster/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/raster/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -110,48 +110,16 @@
r.watershed \
r.what \
r.what.color \
- wildfire
+ wildfire \
+ r.in.gdal \
+ r.out.gdal \
+ r.surf.fractal \
+ r.out.png \
+ r.terraflow \
+ r.out.tiff
# r.le \
-GDALBASED = r.in.gdal r.out.gdal
-
-FFTWBASED = r.surf.fractal
-
-PNGBASED = r.out.png
-
-CXXBASED = r.terraflow
-
-TIFFBASED = r.out.tiff
-
-include $(MODULE_TOPDIR)/include/Make/Vars.make
-
-#compile if GDAL present:
-ifneq ($(USE_GDAL),)
- SUBDIRS += $(GDALBASED)
-endif
-
-#compile if FFTW present:
-ifneq ($(strip $(FFTWLIB)),)
- SUBDIRS += $(FFTWBASED)
-endif
-
-#compile if PNG present:
-ifneq ($(strip $(PNGLIB)),)
- SUBDIRS += $(PNGBASED)
-endif
-
-#compile if C++ compiler present:
-ifneq ($(strip $(CXX)),)
- SUBDIRS += $(CXXBASED)
-endif
-
-#compile if TIFF present:
-ifneq ($(strip $(TIFFLIB)),)
- SUBDIRS += $(TIFFBASED)
-endif
-
-
PGM = rasterintro
include $(MODULE_TOPDIR)/include/Make/Dir.make
Modified: grass/trunk/raster/r.external/Makefile
===================================================================
--- grass/trunk/raster/r.external/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/raster/r.external/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -10,6 +10,4 @@
ifneq ($(USE_GDAL),)
default: cmd
-else
-default:
endif
Modified: grass/trunk/raster/r.in.gdal/Makefile
===================================================================
--- grass/trunk/raster/r.in.gdal/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/raster/r.in.gdal/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -8,4 +8,6 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
+ifneq ($(USE_GDAL),)
default: cmd
+endif
Modified: grass/trunk/raster/r.out.gdal/Makefile
===================================================================
--- grass/trunk/raster/r.out.gdal/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/raster/r.out.gdal/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -8,4 +8,6 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
+ifneq ($(USE_GDAL),)
default: cmd
+endif
Modified: grass/trunk/raster/r.out.png/Makefile
===================================================================
--- grass/trunk/raster/r.out.png/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/raster/r.out.png/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -8,4 +8,6 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
+ifneq ($(strip $(PNGLIB)),)
default: cmd
+endif
Modified: grass/trunk/raster/r.out.tiff/Makefile
===================================================================
--- grass/trunk/raster/r.out.tiff/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/raster/r.out.tiff/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -9,4 +9,6 @@
LIBES = $(GISLIB) $(TIFFLIBPATH) $(TIFFLIB)
DEPENDENCIES = $(GISDEP)
+ifneq ($(strip $(TIFFLIB)),)
default: cmd
+endif
Modified: grass/trunk/raster/r.surf.fractal/Makefile
===================================================================
--- grass/trunk/raster/r.surf.fractal/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/raster/r.surf.fractal/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -8,4 +8,6 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
+ifneq ($(strip $(FFTWLIB)),)
default: cmd
+endif
Modified: grass/trunk/raster/r.terraflow/Makefile
===================================================================
--- grass/trunk/raster/r.terraflow/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/raster/r.terraflow/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -14,4 +14,6 @@
LINK = $(CXX)
+ifneq ($(strip $(CXX)),)
default: cmd
+endif
Modified: grass/trunk/vector/Makefile
===================================================================
--- grass/trunk/vector/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/vector/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -1,7 +1,7 @@
MODULE_TOPDIR = ..
-include $(MODULE_TOPDIR)/include/Make/Vars.make
+PGM = vectorintro
SUBDIRS = \
v.buffer \
@@ -71,32 +71,13 @@
v.what \
v.what.rast\
v.vol.rst \
- lidar
+ lidar \
+ v.out.ogr \
+ v.in.ogr \
+ v.external \
+ v.digit \
+ v.in.dwg
-OGRBASED = v.out.ogr v.in.ogr v.external
-
-#compile if OGR present:
-ifneq ($(USE_OGR),)
- SUBDIRS += $(OGRBASED)
-endif
-
-TCLTKBASED = v.digit
-
-#compile if Tcl/Tk present:
-ifneq ($(strip $(TCLTKLIBS)),)
- SUBDIRS += $(TCLTKBASED)
-endif
-
-
-OPENDWGBASED = v.in.dwg
-
-#compile if OPENDWG present:
-ifneq ($(USE_OPENDWG),)
- SUBDIRS += $(OPENDWGBASED)
-endif
-
-PGM = vectorintro
-
include $(MODULE_TOPDIR)/include/Make/Dir.make
default: htmldir
Modified: grass/trunk/vector/v.digit/Makefile
===================================================================
--- grass/trunk/vector/v.digit/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/vector/v.digit/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -13,9 +13,11 @@
AUXDIR := $(ARCH_DISTDIR)/etc/v.digit
TCLFILES := $(patsubst %,$(AUXDIR)/%,$(wildcard *.tcl))
+ifneq ($(strip $(TCLTKLIBS)),)
pre: $(AUXDIR)
default: cmd $(TCLFILES)
+endif
$(AUXDIR):
if [ ! -d $(ETC) ]; then $(MKDIR) $(ETC); fi
Modified: grass/trunk/vector/v.external/Makefile
===================================================================
--- grass/trunk/vector/v.external/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/vector/v.external/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -7,8 +7,10 @@
EXTRA_INC = $(VECT_INC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
-
+
include $(MODULE_TOPDIR)/include/Make/Module.make
+ifneq ($(USE_OGR),)
default: cmd
+endif
Modified: grass/trunk/vector/v.in.dwg/Makefile
===================================================================
--- grass/trunk/vector/v.in.dwg/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/vector/v.in.dwg/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -10,7 +10,9 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
+ifneq ($(USE_OPENDWG),)
default: chck cmd $(ADINIT)
+endif
chck:
./check
Modified: grass/trunk/vector/v.in.ogr/Makefile
===================================================================
--- grass/trunk/vector/v.in.ogr/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/vector/v.in.ogr/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -7,8 +7,10 @@
EXTRA_INC = $(VECT_INC) $(PROJINC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
-
+
include $(MODULE_TOPDIR)/include/Make/Module.make
+ifneq ($(USE_OGR),)
default: cmd
+endif
Modified: grass/trunk/vector/v.out.ogr/Makefile
===================================================================
--- grass/trunk/vector/v.out.ogr/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/vector/v.out.ogr/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -10,8 +10,9 @@
DEPENDENCIES = $(VECTDEP) $(GPROJDEP) $(GISDEP)
EXTRA_INC = $(VECT_INC) $(PROJINC)
EXTRA_CFLAGS = $(VECT_CFLAGS)
-
+
include $(MODULE_TOPDIR)/include/Make/Module.make
+ifneq ($(USE_OGR),)
default: cmd
-
+endif
Modified: grass/trunk/visualization/Makefile
===================================================================
--- grass/trunk/visualization/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/visualization/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -1,32 +1,8 @@
MODULE_TOPDIR = ..
-SUBDIRS =
+SUBDIRS = nviz nviz2 xganim ximgview
-include $(MODULE_TOPDIR)/include/Make/Vars.make
-
-#compile if OpenGL and Tcl/Tk present:
-ifneq ($(USE_OPENGL),)
-ifneq ($(strip $(TCLTKLIBS)),)
- SUBDIRS += nviz
-endif
-endif
-
-#compile if OpenGL present
-ifneq ($(USE_OPENGL),)
- SUBDIRS += nviz2
-endif
-
-#compile if Motif present:
-ifneq ($(strip $(XMLIB)),)
- SUBDIRS += xganim
-endif
-
-ifneq ($(USE_X11),)
- SUBDIRS += ximgview
-endif
-
include $(MODULE_TOPDIR)/include/Make/Dir.make
default: parsubdirs
-
Modified: grass/trunk/visualization/nviz/Makefile
===================================================================
--- grass/trunk/visualization/nviz/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/visualization/nviz/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -20,11 +20,15 @@
$(wildcard scripts/*.tcl) \
$(wildcard scripts/*Index)
+ifneq ($(USE_OPENGL),)
+ifneq ($(strip $(TCLTKLIBS)),)
default:
$(MAKE) -C src
$(MAKE) install
$(MAKE) -C html
$(MAKE) html
+endif
+endif
# Install the scripts in the appropriate directory
install:
Modified: grass/trunk/visualization/nviz2/cmd/Makefile
===================================================================
--- grass/trunk/visualization/nviz2/cmd/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/visualization/nviz2/cmd/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -30,4 +30,6 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
+ifneq ($(USE_OPENGL),)
default: cmd
+endif
Modified: grass/trunk/visualization/xganim/Makefile
===================================================================
--- grass/trunk/visualization/xganim/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/visualization/xganim/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -9,4 +9,6 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
+ifneq ($(strip $(XMLIB)),)
default: cmd
+endif
Modified: grass/trunk/visualization/ximgview/Makefile
===================================================================
--- grass/trunk/visualization/ximgview/Makefile 2008-11-16 10:13:45 UTC (rev 34328)
+++ grass/trunk/visualization/ximgview/Makefile 2008-11-16 11:54:34 UTC (rev 34329)
@@ -9,4 +9,6 @@
include $(MODULE_TOPDIR)/include/Make/Module.make
+ifneq ($(USE_X11),)
default: cmd
+endif
More information about the grass-commit
mailing list