Reduce the number of files generated by configure

 Move GRASS_VERSION_* from Grass.make[.in] to Platform.make[.in]
 Make Grass.make and swig/python/Makefile static files, not generated by configure
 Remove include/winname.h.in (no longer needed)


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

configure

@@ -15344,7 +15344,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "include/Make/Grass.make include/Make/Platform.make include/version.h include/winname.h swig/perl/Makefile.PL swig/perl2/make.pl swig/python/Makefile grass.pc include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "include/Make/Platform.make include/version.h swig/perl/Makefile.PL swig/perl2/make.pl grass.pc include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -15591,7 +15591,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"include/Make/Grass.make include/Make/Platform.make include/version.h include/winname.h swig/perl/Makefile.PL swig/perl2/make.pl swig/python/Makefile grass.pc"}
+CONFIG_FILES=\${CONFIG_FILES-"include/Make/Platform.make include/version.h swig/perl/Makefile.PL swig/perl2/make.pl grass.pc"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then

configure.in

@@ -1692,7 +1692,7 @@ AC_SUBST(STRIPFLAG)
 GRASS_HOME=${DSTDIR}
 AC_SUBST(GRASS_HOME)
 
-AC_OUTPUT(include/Make/Grass.make include/Make/Platform.make include/version.h include/winname.h swig/perl/Makefile.PL swig/perl2/make.pl swig/python/Makefile grass.pc)
+AC_OUTPUT(include/Make/Platform.make include/version.h swig/perl/Makefile.PL swig/perl2/make.pl grass.pc)
 
 LOC_MSG([Copying config.status to config.status.${ARCH}])
 cp -f config.status config.status.${ARCH}

include/Make/Grass.make.in

@@ -22,16 +22,6 @@ SHELL           = /bin/sh
 #
 #########################################################################
 
-#generate static (ST) or shared (SH)
-#LIB_PREFIX=$(STLIB_PREFIX)
-#LIB_SUFFIX=$(STLIB_SUFFIX)
-#LIB_PREFIX=$(SHLIB_PREFIX)
-#LIB_SUFFIX=$(SHLIB_SUFFIX)
-LIB_PREFIX=@GRASS_LIB_PREFIX@
-LIB_SUFFIX=@GRASS_LIB_SUFFIX@
-GRASS_LIBRARY_TYPE=@GRASS_LIBRARY_TYPE@
-
-
 # GRASS global directories and constants
 # platform specific dirs
 ARCH_DISTDIR	= $(GRASS_HOME)/dist.$(ARCH)
@@ -64,11 +54,6 @@ DBDRIVERDIR     = $(ARCH_DISTDIR)/driver/db
 
 FONTDIR         = $(ARCH_DISTDIR)/fonts
 
-GRASS_VERSION_MAJOR   = @GRASS_VERSION_MAJOR@
-GRASS_VERSION_MINOR   = @GRASS_VERSION_MINOR@
-GRASS_VERSION_RELEASE = @GRASS_VERSION_RELEASE@
-GRASS_VERSION_DATE    = @GRASS_VERSION_DATE@
-
 GRASS_VERSION_NUMBER  = $(GRASS_VERSION_MAJOR).$(GRASS_VERSION_MINOR).$(GRASS_VERSION_RELEASE)
 GRASS_VERSION_NAME    = $(GRASS_VERSION_MAJOR)$(GRASS_VERSION_MINOR)$(GRASS_VERSION_RELEASE)
 

include/Make/Platform.make.in

@@ -40,6 +40,11 @@ ARCH                = @host@
 UNIX_BIN            = @BINDIR@
 INST_DIR            = @INSTDIR@
 
+GRASS_VERSION_MAJOR = @GRASS_VERSION_MAJOR@
+GRASS_VERSION_MINOR = @GRASS_VERSION_MINOR@
+GRASS_VERSION_RELEASE = @GRASS_VERSION_RELEASE@
+GRASS_VERSION_DATE  = @GRASS_VERSION_DATE@
+
 PLAT_OBJS           = @PLAT_OBJS@
 STRIPFLAG           = @STRIPFLAG@
 CC_SEARCH_FLAGS     = @CC_SEARCH_FLAGS@
@@ -47,6 +52,11 @@ LD_SEARCH_FLAGS     = @LD_SEARCH_FLAGS@
 LD_LIBRARY_PATH_VAR = @LD_LIBRARY_PATH_VAR@
 LIB_RUNTIME_DIR     = $(ARCH_LIBDIR)
 
+#generate static (ST) or shared (SH)
+LIB_PREFIX          = @GRASS_LIB_PREFIX@
+LIB_SUFFIX          = @GRASS_LIB_SUFFIX@
+GRASS_LIBRARY_TYPE  = @GRASS_LIBRARY_TYPE@
+
 #static libs:
 STLIB_LD            = @STLIB_LD@
 STLIB_PREFIX        = lib

include/winname.h.in

@@ -1 +0,0 @@
-#define WIN_NAME "@GRASS_VERSION_NUMBER@"

swig/python/Makefile.in

@@ -16,9 +16,6 @@ default: python_grass7.so
 clean:
 	-rm -f *.o *.so python_grass7_wrap.c python_grass7.pyc python_grass7.py
 
-distclean: clean
-	-rm -f Makefile
-
 python_grass7_wrap.c: python_grass7.i
 	$(MAKE) -C interfaces
 	$(SWIG) -python -shadow $<