Rename description.html -> $(PGM).html

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

gui/tcltk/gis.m/Makefile

@@ -4,20 +4,15 @@ PGM=gis.m
 
 include $(MODULE_TOPDIR)/include/Make/Script.make
 
-default: script install_scripts myhtml
+default: script install_scripts
 
 install_scripts:
 	if [ ! -d $(GISBASE)/etc/gm ] ; then $(MKDIR) $(GISBASE)/etc/gm; fi
-	#$(INSTALL) description.html $(GISBASE)/docs/html/gis.m.html
 	for file in *.tcl ; do $(INSTALL) $$file $(GISBASE)/etc/gm/ ; done
 	for file in *.gif ; do $(INSTALL_DATA) $$file $(GISBASE)/etc/gm/ ; done
 	for file in docs/gm_*.html ; do $(INSTALL_DATA) $$file $(GISBASE)/docs/html/ ; done
 	for file in docs/gm_*.png ; do $(INSTALL_DATA) $$file $(GISBASE)/docs/html/ ; done
 	for file in docs/gm_*.jpg ; do $(INSTALL_DATA) $$file $(GISBASE)/docs/html/ ; done
 
-myhtml:
-	$(MAKE) htmlscript PGM=gis.m
-
-
 $(BIN)/$(PGM).bat: $(PGM).bat
 	$(INSTALL_DATA) $< $@

imagery/i.ortho.photo/photo.2image/Makefile

@@ -11,6 +11,6 @@ include $(MODULE_TOPDIR)/include/Make/Module.make
 
 default: etc
 
-$(PGM).tmp.html: description.html
+$(PGM).tmp.html: $(PGM).html
 	$(INSTALL_DATA) $< $@
 

imagery/i.ortho.photo/photo.2target/Makefile

@@ -10,6 +10,3 @@ DEPENDENCIES= $(IMAGERYDEP) $(DISPLAYDEP) $(RASTERDEP) $(IORTHODEP) $(GISDEP) $(
 include $(MODULE_TOPDIR)/include/Make/Module.make
 
 default: etc
-
-$(PGM).tmp.html: $(ETC)/$(PGM)$(EXE)
-	$(call htmldesc,$(ETC)/$(PGM)$(EXE))

imagery/i.ortho.photo/photo.camera/Makefile

@@ -11,7 +11,5 @@ include $(MODULE_TOPDIR)/include/Make/Module.make
 
 default: etc
 
-htmletc:
-	$(MKDIR) $(GISBASE)/docs/html
-	$(INSTALL_DATA) description.html $(GISBASE)/docs/html/$(PGM).html
-	$(INSTALL_DATA) *.png $(GISBASE)/docs/html/
+$(PGM).tmp.html: $(PGM).html
+	$(INSTALL_DATA) $< $@

imagery/i.ortho.photo/photo.init/Makefile

@@ -11,6 +11,6 @@ include $(MODULE_TOPDIR)/include/Make/Module.make
 
 default: etc
 
-$(PGM).tmp.html: description.html
+$(PGM).tmp.html: $(PGM).html
 	$(INSTALL_DATA) $< $@
 

imagery/i.ortho.photo/photo.rectify/Makefile

@@ -13,6 +13,6 @@ include $(MODULE_TOPDIR)/include/Make/Module.make
 
 default: etc
 
-$(PGM).tmp.html: description.html
+$(PGM).tmp.html: $(PGM).html
 	$(INSTALL_DATA) $< $@
 

lib/cairodriver/Makefile

@@ -2,19 +2,17 @@ MODULE_TOPDIR = ../..
 
 include $(MODULE_TOPDIR)/include/Make/Platform.make
 
-PACKAGE ="libcairodriver"
-DEFS=-DPACKAGE=\"$(PACKAGE)\"
-
-EXTRA_CFLAGS=-I../driver $(CAIROINC) $(PICFLAGS) $(DEFS)
+EXTRA_CFLAGS=-I../driver $(CAIROINC)
 EXTRA_LIBS=$(DRIVERLIB) $(GISLIB) $(CAIROLIB)
 
 # added constant to /include/Make/Grass.make.in
 LIB_NAME = $(CAIRODRIVER_LIBNAME)
+PGM = cairodriver
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
 ifneq ($(USE_CAIRO),)
-default: lib
+default: lib htmldir
 else
 default:
 endif

lib/db/sqlp/Makefile

@@ -1,6 +1,7 @@
 MODULE_TOPDIR = ../../..
 
 LIB_NAME = $(SQLP_LIBNAME)
+PGM = sql
 
 LIB_OBJS = \
 	alloc.o \
@@ -14,9 +15,7 @@ EXTRA_HEADERS = y.tab.h
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-default: lib
-	$(MKDIR) $(GISBASE)/docs/html
-	$(INSTALL_DATA) description.html $(GISBASE)/docs/html/sql.html
+default: lib htmldir
 
 y.tab.c y.tab.h: yac.y
 	$(YACC) -d -v yac.y

lib/htmldriver/Makefile

@@ -2,13 +2,12 @@ MODULE_TOPDIR = ../..
 
 include $(MODULE_TOPDIR)/include/Make/Platform.make
 
-PACKAGE ="libhtmldriver"
-DEFS=-DPACKAGE=\"$(PACKAGE)\"
-EXTRA_CFLAGS=-I../driver $(PICFLAGS) $(DEFS)
+EXTRA_CFLAGS=-I../driver
 
 EXTRA_LIBS=$(DRIVERLIB) $(GISLIB)
 LIB_NAME = $(HTMLDRIVER_LIBNAME)
+PGM = htmldriver
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-default: lib
+default: lib htmldir

lib/pngdriver/Makefile

@@ -2,12 +2,11 @@ MODULE_TOPDIR = ../..
 
 include $(MODULE_TOPDIR)/include/Make/Platform.make
 
-PACKAGE ="libpngdriver"
-DEFS=-DPACKAGE=\"$(PACKAGE)\"
-EXTRA_CFLAGS=$(GETHOSTNAME) $(ZLIBINCPATH) $(PNGINC) -I../driver $(PICFLAGS) $(DEFS)
+EXTRA_CFLAGS=$(GETHOSTNAME) $(ZLIBINCPATH) $(PNGINC) -I../driver
 
 EXTRA_LIBS=$(DRIVERLIB) $(GISLIB) $(PNGLIB)
 LIB_NAME = $(PNGDRIVER_LIBNAME)
+PGM = cairodriver
 
 LIB_OBJS =	\
 	Box.o			\
@@ -37,4 +36,4 @@ endif
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-default: lib
+default: lib htmldir

lib/psdriver/Makefile

@@ -2,16 +2,15 @@ MODULE_TOPDIR = ../..
 
 include $(MODULE_TOPDIR)/include/Make/Platform.make
 
-PACKAGE ="libpsdriver"
-DEFS=-DPACKAGE=\"$(PACKAGE)\"
-EXTRA_CFLAGS=-I../driver $(PICFLAGS) $(DEFS)
+EXTRA_CFLAGS=-I../driver
 
 EXTRA_LIBS=$(DRIVERLIB) $(GISLIB)
 LIB_NAME = $(PSDRIVER_LIBNAME)
+PGM = psdriver
 
 include $(MODULE_TOPDIR)/include/Make/Lib.make
 
-default: lib $(ETC)/psdriver.ps
+default: lib htmldir $(ETC)/psdriver.ps
 
 $(ETC)/psdriver.ps: psdriver.ps
 	$(INSTALL_DATA) $< $@