Clean up handling of optional components

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@34329 15284696-431f-4ddb-bdfa-cd5b030d7da7

general/g.mlist/Makefile

@@ -10,6 +10,4 @@ include $(MODULE_TOPDIR)/include/Make/Module.make
 
 ifneq ($(USE_REGEX),)
 default: cmd
-else
-default:
 endif

general/g.mremove/Makefile

@@ -11,6 +11,4 @@ include $(MODULE_TOPDIR)/include/Make/Module.make
 
 ifneq ($(USE_REGEX),)
 default: cmd
-else
-default:
 endif

gui/wxpython/Makefile

@@ -1,21 +1,6 @@
 MODULE_TOPDIR = ../..
 
-SUBDIRS = docs scripts
-
-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
+SUBDIRS = docs scripts vdigit nviz
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 

gui/wxpython/nviz/Makefile

@@ -22,7 +22,15 @@ SHLIB = $(OBJDIR)/_$(LIB_NAME).so
 
 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

gui/wxpython/vdigit/Makefile

@@ -22,7 +22,13 @@ SHLIB = $(OBJDIR)/_$(LIB_NAME).so
 
 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

imagery/Makefile

@@ -1,7 +1,5 @@
 MODULE_TOPDIR = ..
 
-include $(MODULE_TOPDIR)/include/Make/Vars.make
-
 SUBDIRS = \
 	i.albedo \
 	i.atcorr \
@@ -22,14 +20,10 @@ SUBDIRS = \
 	i.sunhours \
 	i.target \
 	i.pca \
-	i.vi 
-
-FFTWBASED = i.fft i.ifft i.zc
-
-#compile if FFTW present:
-ifneq ($(strip $(FFTWLIB)),)
-    SUBDIRS += $(FFTWBASED)
-endif
+	i.vi \
+	i.fft \
+	i.ifft \
+	i.zc
 
 PGM = imageryintro
 

imagery/i.fft/Makefile

@@ -7,4 +7,6 @@ DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
+ifneq ($(strip $(FFTWLIB)),)
 default: cmd
+endif

imagery/i.ifft/Makefile

@@ -7,4 +7,6 @@ DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
+ifneq ($(strip $(FFTWLIB)),)
 default: cmd
+endif

imagery/i.zc/Makefile

@@ -7,4 +7,6 @@ DEPENDENCIES= $(IMAGERYDEP) $(GMATHDEP) $(GISDEP) $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
+ifneq ($(strip $(FFTWLIB)),)
 default: cmd
+endif

include/Make/Rules.make

@@ -10,6 +10,8 @@ ARCH_DIRS = $(ARCH_DISTDIR) $(ARCH_BINDIR) $(ARCH_INCDIR) $(ARCH_LIBDIR) \
 
 pre: $(ARCH_DIRS)
 
+default:
+
 $(ARCH_DIRS):
 	$(MKDIR) $@
 

lib/cairodriver/Makefile

@@ -11,7 +11,5 @@ include $(MODULE_TOPDIR)/include/Make/Lib.make
 
 ifneq ($(USE_CAIRO),)
 default: lib
-else
-default:
 endif
 

lib/iostream/Makefile

@@ -10,6 +10,4 @@ endif
 
 ifneq ($(strip $(CXX)),)
 default: stlib
-else
-default:
 endif

lib/nviz/Makefile

@@ -17,8 +17,6 @@ EXTRA_CFLAGS = $(VECT_CFLAGS) $(XCFLAGS)
 
 ifneq ($(USE_OPENGL),)
 default: lib
-else
-default:
 endif
 
 # doxygen

lib/ogsf/Makefile

@@ -12,8 +12,6 @@ EXTRA_CFLAGS = $(VECT_CFLAGS) $(XCFLAGS)
 
 ifneq ($(USE_OPENGL),)
 default: lib
-else
-default:
 endif
 
 #doxygen:

raster/Makefile

@@ -110,48 +110,16 @@ SUBDIRS = \
 	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

raster/r.external/Makefile

@@ -10,6 +10,4 @@ include $(MODULE_TOPDIR)/include/Make/Module.make
 
 ifneq ($(USE_GDAL),)
 default: cmd
-else
-default:
 endif

raster/r.in.gdal/Makefile

@@ -8,4 +8,6 @@ EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
+ifneq ($(USE_GDAL),)
 default: cmd
+endif

raster/r.out.gdal/Makefile

@@ -8,4 +8,6 @@ EXTRA_INC = $(PROJINC) $(GDALCFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
+ifneq ($(USE_GDAL),)
 default: cmd
+endif

raster/r.out.png/Makefile

@@ -8,4 +8,6 @@ DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
+ifneq ($(strip $(PNGLIB)),)
 default: cmd
+endif

raster/r.out.tiff/Makefile

@@ -9,4 +9,6 @@ EXTRA_CFLAGS = $(TIFFINCPATH)
 LIBES = $(GISLIB) $(TIFFLIBPATH) $(TIFFLIB)
 DEPENDENCIES = $(GISDEP)
 
+ifneq ($(strip $(TIFFLIB)),)
 default: cmd
+endif

raster/r.surf.fractal/Makefile

@@ -8,4 +8,6 @@ EXTRA_INC = $(FFTWINC)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
+ifneq ($(strip $(FFTWLIB)),)
 default: cmd
+endif

raster/r.terraflow/Makefile

@@ -14,4 +14,6 @@ endif
 
 LINK = $(CXX)
 
+ifneq ($(strip $(CXX)),)
 default: cmd
+endif

vector/Makefile

@@ -1,7 +1,7 @@
 
 MODULE_TOPDIR = ..
 
-include $(MODULE_TOPDIR)/include/Make/Vars.make
+PGM = vectorintro
 
 SUBDIRS = \
 	v.buffer \
@@ -71,31 +71,12 @@ SUBDIRS = \
 	v.what \
 	v.what.rast\
 	v.vol.rst \
-	lidar
-
-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
+	lidar \
+	v.out.ogr \
+	v.in.ogr \
+	v.external \
+	v.digit \
+	v.in.dwg
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 

vector/v.digit/Makefile

@@ -13,9 +13,11 @@ EXTRA_INC = $(VECT_INC)
 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

vector/v.external/Makefile

@@ -7,8 +7,10 @@ DEPENDENCIES = $(VECTDEP) $(GISDEP)
 
 EXTRA_INC = $(VECT_INC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
- 
+
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
+ifneq ($(USE_OGR),)
 default: cmd
+endif
 

vector/v.in.dwg/Makefile

@@ -10,7 +10,9 @@ EXTRA_CFLAGS = $(VECT_CFLAGS)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
+ifneq ($(USE_OPENDWG),)
 default: chck cmd $(ADINIT)
+endif
 
 chck:
 	./check

vector/v.in.ogr/Makefile

@@ -7,8 +7,10 @@ DEPENDENCIES = $(VECTDEP) $(GPROJDEP) $(DBMIDEP) $(GISDEP)
 
 EXTRA_INC = $(VECT_INC) $(PROJINC)
 EXTRA_CFLAGS = $(VECT_CFLAGS)
- 
+
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
+ifneq ($(USE_OGR),)
 default: cmd
+endif
 

vector/v.out.ogr/Makefile

@@ -10,8 +10,9 @@ LIBES     = $(VECTLIB) $(GPROJLIB) $(GISLIB) $(GDALLIBS)
 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

visualization/Makefile

@@ -1,32 +1,8 @@
 MODULE_TOPDIR = ..
 
-SUBDIRS =
-
-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
+SUBDIRS = nviz nviz2 xganim ximgview
 
 include $(MODULE_TOPDIR)/include/Make/Dir.make
 
 default: parsubdirs
 
-

visualization/nviz/Makefile

@@ -20,11 +20,15 @@ SCRIPTS := \
 	$(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:

visualization/nviz2/cmd/Makefile

@@ -30,4 +30,6 @@ DEPENDENCIES = $(GISDEP) $(NVIZDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
+ifneq ($(USE_OPENGL),)
 default: cmd
+endif

visualization/xganim/Makefile

@@ -9,4 +9,6 @@ DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
+ifneq ($(strip $(XMLIB)),)
 default: cmd
+endif

visualization/ximgview/Makefile

@@ -9,4 +9,6 @@ DEPENDENCIES = $(GISDEP)
 
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
+ifneq ($(USE_X11),)
 default: cmd
+endif