Move headers from include to include/grass (#1350)

The include contained the header files are there directly while distribution has them in include/grass which is an unnecessary difference. Having them in a subdirectory can make it easier for code editing tools and other operations directly running on the source tree. See also: * https://trac.osgeo.org/grass/wiki/G8SourceLayout This creates the new grass directory, moves the header files, and updates build system to use this new layout. Makefile for makefiles and for header files is now split into two.
OSGeo · Mar 31, 2021 · 61d6f8c · 61d6f8c
1 parent 27b12e2
commit 61d6f8c
Show file tree

Hide file tree

Showing 110 changed files with 56 additions and 45 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,8 +18,8 @@ gui/wxpython/xml/module_tree_menudata.xml
 include/Make/Doxyfile_arch_html
 include/Make/Doxyfile_arch_latex
 include/Make/Platform.make
-include/config.h
-include/version.h
+include/grass/config.h
+include/grass/version.h
 lib/db/sqlp/sqlp.output
 lib/db/sqlp/sqlp.tab.c
 lib/db/sqlp/sqlp.tab.h

diff --git a/Makefile b/Makefile
@@ -122,7 +122,7 @@ libsclean: cleandistdirs
 distclean: clean
 	-rm -f config.cache config.log config.status config.status.$(ARCH) 2>/dev/null
 	-rm -f ChangeLog ChangeLog.bak $(ERRORLOG) grass.pc
-	-rm -f include/config.h include/version.h
+	-rm -f include/grass/config.h include/grass/version.h
 	-rm -f include/Make/Platform.make include/Make/Doxyfile_arch_html include/Make/Doxyfile_arch_latex 2>/dev/null
 
 include $(MODULE_TOPDIR)/include/Make/Install.make

diff --git a/configure b/configure
@@ -14181,7 +14181,7 @@ done
 ac_given_srcdir=$srcdir
 ac_given_INSTALL="$INSTALL"
 
-trap 'rm -fr `echo "include/Make/Platform.make include/Make/Doxyfile_arch_html include/Make/Doxyfile_arch_latex include/version.h grass.pc include/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "include/Make/Platform.make include/Make/Doxyfile_arch_html include/Make/Doxyfile_arch_latex include/grass/version.h grass.pc include/grass/config.h" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -14435,7 +14435,7 @@ EOF
 
 cat >> $CONFIG_STATUS <<EOF
 
-CONFIG_FILES=\${CONFIG_FILES-"include/Make/Platform.make include/Make/Doxyfile_arch_html include/Make/Doxyfile_arch_latex include/version.h grass.pc"}
+CONFIG_FILES=\${CONFIG_FILES-"include/Make/Platform.make include/Make/Doxyfile_arch_html include/Make/Doxyfile_arch_latex include/grass/version.h grass.pc"}
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 for ac_file in .. $CONFIG_FILES; do if test "x$ac_file" != x..; then
@@ -14516,7 +14516,7 @@ ac_eD='%g'
 if test "${CONFIG_HEADERS+set}" != set; then
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="include/config.h"
+  CONFIG_HEADERS="include/grass/config.h"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 fi

diff --git a/configure.in b/configure.in
@@ -31,7 +31,7 @@ $2
 AC_INIT(configure.in)
 AC_PREREQ(2.13)
 AC_PREFIX_DEFAULT(/usr/local)
-AC_CONFIG_HEADER(include/config.h)
+AC_CONFIG_HEADER(include/grass/config.h)
 AC_CANONICAL_HOST
 AC_PROG_CC
 LOC_EXEEXT
@@ -1987,7 +1987,7 @@ AC_SUBST(STRIPFLAG)
 GRASS_HOME="${DSTDIR}"
 AC_SUBST(GRASS_HOME)
 
-AC_OUTPUT(include/Make/Platform.make include/Make/Doxyfile_arch_html include/Make/Doxyfile_arch_latex include/version.h grass.pc)
+AC_OUTPUT(include/Make/Platform.make include/Make/Doxyfile_arch_html include/Make/Doxyfile_arch_latex include/grass/version.h grass.pc)
 
 LOC_MSG([Copying config.status to config.status.${ARCH}])
 cp -f config.status config.status.${ARCH}

diff --git a/include/Makefile b/include/Makefile
@@ -3,50 +3,18 @@ MODULE_TOPDIR = ..
 include $(MODULE_TOPDIR)/include/Make/Vars.make
 include $(MODULE_TOPDIR)/include/Make/Rules.make
 
-SRCH := $(wildcard ../include/*.h ../include/defs/*.h ../include/vect/*.h ../include/iostream/*.h)
-DSTH := $(patsubst ../include/%.h,$(ARCH_INCDIR)/%.h,$(SRCH))
-DSTH_EXTRA = $(ARCH_INCDIR)/copying.h $(ARCH_INCDIR)/citing.h $(ARCH_INCDIR)/confparms.h
-
 SRCMAKE := $(wildcard ../include/Make/*.make)
 DSTMAKE := $(patsubst ../include/Make/%.make,$(ARCH_DISTDIR)/include/Make/%.make,$(SRCMAKE))
 
-default: $(DSTH) $(DSTH_EXTRA) $(DSTMAKE)
-
-# cancel rule from Rules.make
-$(ARCH_INCDIR)/%.h: %.h
-
-$(ARCH_INCDIR)/defs/%.h: defs/%.h | $(ARCH_INCDIR)/defs
-	$(INSTALL_DATA) $< $@
-
-$(ARCH_INCDIR)/vect/%.h: vect/%.h | $(ARCH_INCDIR)/vect
-	$(INSTALL_DATA) $< $@
-
-$(ARCH_INCDIR)/iostream/%.h: iostream/%.h | $(ARCH_INCDIR)/iostream
-	$(INSTALL_DATA) $< $@
-
-$(ARCH_INCDIR)/%.h: %.h | $(ARCH_INCDIR)
-	$(INSTALL_DATA) $< $@
-
-$(ARCH_INCDIR)/defs: | $(ARCH_INCDIR)
-	$(MKDIR) $@
-
-$(ARCH_INCDIR)/vect: | $(ARCH_INCDIR)
-	$(MKDIR) $@
-
-$(ARCH_INCDIR)/iostream: | $(ARCH_INCDIR)
-	$(MKDIR) $@
+default: $(DSTMAKE) parsubdirs
 
 $(ARCH_DISTDIR)/include/Make/%.make: Make/%.make | $(ARCH_DISTDIR)/include/Make
 	$(INSTALL_DATA) $< $@
 
 $(ARCH_DISTDIR)/include/Make:
 	$(MKDIR) $@
 
-$(ARCH_INCDIR)/copying.h: $(MODULE_TOPDIR)/COPYING | $(ARCH_INCDIR)
-	sed -e 's/^\(.*\)$$/"\1\\n"/' $< > $@
-
-$(ARCH_INCDIR)/citing.h: $(MODULE_TOPDIR)/CITING | $(ARCH_INCDIR)
-	sed -e 's/^\(.*\)$$/"\1\\n"/' $< > $@
+SUBDIRS = \
+	grass
 
-$(ARCH_INCDIR)/confparms.h: $(MODULE_TOPDIR)/config.status | $(ARCH_INCDIR)
-	sed -n '7s/^#\(.*\)$$/"\1"/p' $< > $@
+include $(MODULE_TOPDIR)/include/Make/Dir.make
diff --git a/include/grass/Makefile b/include/grass/Makefile
@@ -0,0 +1,43 @@
+MODULE_TOPDIR = ../..
+
+include $(MODULE_TOPDIR)/include/Make/Vars.make
+include $(MODULE_TOPDIR)/include/Make/Rules.make
+
+SRCH := $(wildcard ../../include/grass/*.h ../../include/grass/defs/*.h ../../include/grass/vect/*.h ../../include/grass/iostream/*.h)
+DSTH := $(patsubst ../../include/grass/%.h,$(ARCH_INCDIR)/%.h,$(SRCH))
+DSTH_EXTRA = $(ARCH_INCDIR)/copying.h $(ARCH_INCDIR)/citing.h $(ARCH_INCDIR)/confparms.h
+
+default: $(DSTH) $(DSTH_EXTRA)
+
+# cancel rule from Rules.make
+$(ARCH_INCDIR)/%.h: %.h
+
+$(ARCH_INCDIR)/defs/%.h: defs/%.h | $(ARCH_INCDIR)/defs
+	$(INSTALL_DATA) $< $@
+
+$(ARCH_INCDIR)/vect/%.h: vect/%.h | $(ARCH_INCDIR)/vect
+	$(INSTALL_DATA) $< $@
+
+$(ARCH_INCDIR)/iostream/%.h: iostream/%.h | $(ARCH_INCDIR)/iostream
+	$(INSTALL_DATA) $< $@
+
+$(ARCH_INCDIR)/%.h: %.h | $(ARCH_INCDIR)
+	$(INSTALL_DATA) $< $@
+
+$(ARCH_INCDIR)/defs: | $(ARCH_INCDIR)
+	$(MKDIR) $@
+
+$(ARCH_INCDIR)/vect: | $(ARCH_INCDIR)
+	$(MKDIR) $@
+
+$(ARCH_INCDIR)/iostream: | $(ARCH_INCDIR)
+	$(MKDIR) $@
+
+$(ARCH_INCDIR)/copying.h: $(MODULE_TOPDIR)/COPYING | $(ARCH_INCDIR)
+	sed -e 's/^\(.*\)$$/"\1\\n"/' $< > $@
+
+$(ARCH_INCDIR)/citing.h: $(MODULE_TOPDIR)/CITING | $(ARCH_INCDIR)
+	sed -e 's/^\(.*\)$$/"\1\\n"/' $< > $@
+
+$(ARCH_INCDIR)/confparms.h: $(MODULE_TOPDIR)/config.status | $(ARCH_INCDIR)
+	sed -n '7s/^#\(.*\)$$/"\1"/p' $< > $@
diff --git a/include/arraystats.h → include/grass/arraystats.h b/include/arraystats.h → include/grass/arraystats.h
diff --git a/include/bitmap.h → include/grass/bitmap.h b/include/bitmap.h → include/grass/bitmap.h
diff --git a/include/blas.h → include/grass/blas.h b/include/blas.h → include/grass/blas.h
diff --git a/include/btree.h → include/grass/btree.h b/include/btree.h → include/grass/btree.h
diff --git a/include/calc.h → include/grass/calc.h b/include/calc.h → include/grass/calc.h
diff --git a/include/cdhc.h → include/grass/cdhc.h b/include/cdhc.h → include/grass/cdhc.h
diff --git a/include/cluster.h → include/grass/cluster.h b/include/cluster.h → include/grass/cluster.h
diff --git a/include/colors.h → include/grass/colors.h b/include/colors.h → include/grass/colors.h
diff --git a/include/config.h.in → include/grass/config.h.in b/include/config.h.in → include/grass/config.h.in
diff --git a/include/datetime.h → include/grass/datetime.h b/include/datetime.h → include/grass/datetime.h
diff --git a/include/dbmi.h → include/grass/dbmi.h b/include/dbmi.h → include/grass/dbmi.h
diff --git a/include/defs/Paintlib.h → include/grass/defs/Paintlib.h b/include/defs/Paintlib.h → include/grass/defs/Paintlib.h
diff --git a/include/defs/arraystats.h → include/grass/defs/arraystats.h b/include/defs/arraystats.h → include/grass/defs/arraystats.h
diff --git a/include/defs/bitmap.h → include/grass/defs/bitmap.h b/include/defs/bitmap.h → include/grass/defs/bitmap.h
diff --git a/include/defs/btree.h → include/grass/defs/btree.h b/include/defs/btree.h → include/grass/defs/btree.h
diff --git a/include/defs/calc.h → include/grass/defs/calc.h b/include/defs/calc.h → include/grass/defs/calc.h
diff --git a/include/defs/cdhc.h → include/grass/defs/cdhc.h b/include/defs/cdhc.h → include/grass/defs/cdhc.h
diff --git a/include/defs/cluster.h → include/grass/defs/cluster.h b/include/defs/cluster.h → include/grass/defs/cluster.h
diff --git a/include/defs/colors.h → include/grass/defs/colors.h b/include/defs/colors.h → include/grass/defs/colors.h
diff --git a/include/defs/datetime.h → include/grass/defs/datetime.h b/include/defs/datetime.h → include/grass/defs/datetime.h
diff --git a/include/defs/dbmi.h → include/grass/defs/dbmi.h b/include/defs/dbmi.h → include/grass/defs/dbmi.h
diff --git a/include/defs/devlib.h → include/grass/defs/devlib.h b/include/defs/devlib.h → include/grass/defs/devlib.h
diff --git a/include/defs/dig_atts.h → include/grass/defs/dig_atts.h b/include/defs/dig_atts.h → include/grass/defs/dig_atts.h
diff --git a/include/defs/display.h → include/grass/defs/display.h b/include/defs/display.h → include/grass/defs/display.h
diff --git a/include/defs/form.h → include/grass/defs/form.h b/include/defs/form.h → include/grass/defs/form.h
diff --git a/include/defs/gis.h → include/grass/defs/gis.h b/include/defs/gis.h → include/grass/defs/gis.h
diff --git a/include/defs/glocale.h → include/grass/defs/glocale.h b/include/defs/glocale.h → include/grass/defs/glocale.h
diff --git a/include/defs/gmath.h → include/grass/defs/gmath.h b/include/defs/gmath.h → include/grass/defs/gmath.h
diff --git a/include/defs/gprojects.h → include/grass/defs/gprojects.h b/include/defs/gprojects.h → include/grass/defs/gprojects.h
diff --git a/include/defs/imagery.h → include/grass/defs/imagery.h b/include/defs/imagery.h → include/grass/defs/imagery.h
diff --git a/include/defs/la.h → include/grass/defs/la.h b/include/defs/la.h → include/grass/defs/la.h
diff --git a/include/defs/linkm.h → include/grass/defs/linkm.h b/include/defs/linkm.h → include/grass/defs/linkm.h
diff --git a/include/defs/manage.h → include/grass/defs/manage.h b/include/defs/manage.h → include/grass/defs/manage.h
diff --git a/include/defs/neta.h → include/grass/defs/neta.h b/include/defs/neta.h → include/grass/defs/neta.h
diff --git a/include/defs/nviz.h → include/grass/defs/nviz.h b/include/defs/nviz.h → include/grass/defs/nviz.h
diff --git a/include/defs/ogsf.h → include/grass/defs/ogsf.h b/include/defs/ogsf.h → include/grass/defs/ogsf.h
diff --git a/include/defs/ortholib.h → include/grass/defs/ortholib.h b/include/defs/ortholib.h → include/grass/defs/ortholib.h
diff --git a/include/defs/raster.h → include/grass/defs/raster.h b/include/defs/raster.h → include/grass/defs/raster.h
diff --git a/include/defs/raster3d.h → include/grass/defs/raster3d.h b/include/defs/raster3d.h → include/grass/defs/raster3d.h
diff --git a/include/defs/rbtree.h → include/grass/defs/rbtree.h b/include/defs/rbtree.h → include/grass/defs/rbtree.h
diff --git a/include/defs/rowio.h → include/grass/defs/rowio.h b/include/defs/rowio.h → include/grass/defs/rowio.h
diff --git a/include/defs/segment.h → include/grass/defs/segment.h b/include/defs/segment.h → include/grass/defs/segment.h
diff --git a/include/defs/spawn.h → include/grass/defs/spawn.h b/include/defs/spawn.h → include/grass/defs/spawn.h
diff --git a/include/defs/sqlp.h → include/grass/defs/sqlp.h b/include/defs/sqlp.h → include/grass/defs/sqlp.h
diff --git a/include/defs/stats.h → include/grass/defs/stats.h b/include/defs/stats.h → include/grass/defs/stats.h
diff --git a/include/defs/symbol.h → include/grass/defs/symbol.h b/include/defs/symbol.h → include/grass/defs/symbol.h
diff --git a/include/defs/vector.h → include/grass/defs/vector.h b/include/defs/vector.h → include/grass/defs/vector.h
diff --git a/include/defs/vedit.h → include/grass/defs/vedit.h b/include/defs/vedit.h → include/grass/defs/vedit.h
diff --git a/include/display.h → include/grass/display.h b/include/display.h → include/grass/display.h
diff --git a/include/fontcap.h → include/grass/fontcap.h b/include/fontcap.h → include/grass/fontcap.h
diff --git a/include/form.h → include/grass/form.h b/include/form.h → include/grass/form.h
diff --git a/include/gis.h → include/grass/gis.h b/include/gis.h → include/grass/gis.h
diff --git a/include/glocale.h → include/grass/glocale.h b/include/glocale.h → include/grass/glocale.h
diff --git a/include/gmath.h → include/grass/gmath.h b/include/gmath.h → include/grass/gmath.h
diff --git a/include/gprojects.h → include/grass/gprojects.h b/include/gprojects.h → include/grass/gprojects.h
diff --git a/include/imagery.h → include/grass/imagery.h b/include/imagery.h → include/grass/imagery.h
diff --git a/include/iostream/ami.h → include/grass/iostream/ami.h b/include/iostream/ami.h → include/grass/iostream/ami.h
diff --git a/include/iostream/ami_config.h → include/grass/iostream/ami_config.h b/include/iostream/ami_config.h → include/grass/iostream/ami_config.h
diff --git a/include/iostream/ami_sort.h → include/grass/iostream/ami_sort.h b/include/iostream/ami_sort.h → include/grass/iostream/ami_sort.h
diff --git a/include/iostream/ami_sort_impl.h → include/grass/iostream/ami_sort_impl.h b/include/iostream/ami_sort_impl.h → include/grass/iostream/ami_sort_impl.h
diff --git a/include/iostream/ami_stream.h → include/grass/iostream/ami_stream.h b/include/iostream/ami_stream.h → include/grass/iostream/ami_stream.h
diff --git a/include/iostream/embuffer.h → include/grass/iostream/embuffer.h b/include/iostream/embuffer.h → include/grass/iostream/embuffer.h
diff --git a/include/iostream/empq.h → include/grass/iostream/empq.h b/include/iostream/empq.h → include/grass/iostream/empq.h
diff --git a/include/iostream/empq_adaptive.h → include/grass/iostream/empq_adaptive.h b/include/iostream/empq_adaptive.h → include/grass/iostream/empq_adaptive.h
diff --git a/include/iostream/empq_adaptive_impl.h → include/grass/iostream/empq_adaptive_impl.h b/include/iostream/empq_adaptive_impl.h → include/grass/iostream/empq_adaptive_impl.h
diff --git a/include/iostream/empq_impl.h → include/grass/iostream/empq_impl.h b/include/iostream/empq_impl.h → include/grass/iostream/empq_impl.h
diff --git a/include/iostream/imbuffer.h → include/grass/iostream/imbuffer.h b/include/iostream/imbuffer.h → include/grass/iostream/imbuffer.h
diff --git a/include/iostream/mem_stream.h → include/grass/iostream/mem_stream.h b/include/iostream/mem_stream.h → include/grass/iostream/mem_stream.h
diff --git a/include/iostream/minmaxheap.h → include/grass/iostream/minmaxheap.h b/include/iostream/minmaxheap.h → include/grass/iostream/minmaxheap.h
diff --git a/include/iostream/mm.h → include/grass/iostream/mm.h b/include/iostream/mm.h → include/grass/iostream/mm.h
diff --git a/include/iostream/mm_utils.h → include/grass/iostream/mm_utils.h b/include/iostream/mm_utils.h → include/grass/iostream/mm_utils.h
diff --git a/include/iostream/pqheap.h → include/grass/iostream/pqheap.h b/include/iostream/pqheap.h → include/grass/iostream/pqheap.h
diff --git a/include/iostream/queue.h → include/grass/iostream/queue.h b/include/iostream/queue.h → include/grass/iostream/queue.h
diff --git a/include/iostream/quicksort.h → include/grass/iostream/quicksort.h b/include/iostream/quicksort.h → include/grass/iostream/quicksort.h
diff --git a/include/iostream/replacementHeap.h → include/grass/iostream/replacementHeap.h b/include/iostream/replacementHeap.h → include/grass/iostream/replacementHeap.h
diff --git a/include/iostream/replacementHeapBlock.h → ...ude/grass/iostream/replacementHeapBlock.h b/include/iostream/replacementHeapBlock.h → ...ude/grass/iostream/replacementHeapBlock.h
diff --git a/include/iostream/rtimer.h → include/grass/iostream/rtimer.h b/include/iostream/rtimer.h → include/grass/iostream/rtimer.h
diff --git a/include/la.h → include/grass/la.h b/include/la.h → include/grass/la.h
diff --git a/include/lapack.h → include/grass/lapack.h b/include/lapack.h → include/grass/lapack.h
diff --git a/include/linkm.h → include/grass/linkm.h b/include/linkm.h → include/grass/linkm.h
diff --git a/include/manage.h → include/grass/manage.h b/include/manage.h → include/grass/manage.h
diff --git a/include/neta.h → include/grass/neta.h b/include/neta.h → include/grass/neta.h
diff --git a/include/nviz.h → include/grass/nviz.h b/include/nviz.h → include/grass/nviz.h
diff --git a/include/ogsf.h → include/grass/ogsf.h b/include/ogsf.h → include/grass/ogsf.h
diff --git a/include/ortholib.h → include/grass/ortholib.h b/include/ortholib.h → include/grass/ortholib.h
diff --git a/include/raster.h → include/grass/raster.h b/include/raster.h → include/grass/raster.h
diff --git a/include/raster3d.h → include/grass/raster3d.h b/include/raster3d.h → include/grass/raster3d.h
diff --git a/include/rbtree.h → include/grass/rbtree.h b/include/rbtree.h → include/grass/rbtree.h
diff --git a/include/rowio.h → include/grass/rowio.h b/include/rowio.h → include/grass/rowio.h
diff --git a/include/segment.h → include/grass/segment.h b/include/segment.h → include/grass/segment.h
diff --git a/include/spawn.h → include/grass/spawn.h b/include/spawn.h → include/grass/spawn.h
diff --git a/include/sqlp.h → include/grass/sqlp.h b/include/sqlp.h → include/grass/sqlp.h
diff --git a/include/stats.h → include/grass/stats.h b/include/stats.h → include/grass/stats.h
diff --git a/include/symbol.h → include/grass/symbol.h b/include/symbol.h → include/grass/symbol.h
diff --git a/include/temporal.h → include/grass/temporal.h b/include/temporal.h → include/grass/temporal.h
diff --git a/include/vect/dig_defines.h → include/grass/vect/dig_defines.h b/include/vect/dig_defines.h → include/grass/vect/dig_defines.h
diff --git a/include/vect/dig_externs.h → include/grass/vect/dig_externs.h b/include/vect/dig_externs.h → include/grass/vect/dig_externs.h
diff --git a/include/vect/dig_macros.h → include/grass/vect/dig_macros.h b/include/vect/dig_macros.h → include/grass/vect/dig_macros.h
diff --git a/include/vect/dig_structs.h → include/grass/vect/dig_structs.h b/include/vect/dig_structs.h → include/grass/vect/dig_structs.h
diff --git a/include/vect/digit.h → include/grass/vect/digit.h b/include/vect/digit.h → include/grass/vect/digit.h
diff --git a/include/vector.h → include/grass/vector.h b/include/vector.h → include/grass/vector.h
diff --git a/include/vedit.h → include/grass/vedit.h b/include/vedit.h → include/grass/vedit.h
diff --git a/include/version.h.in → include/grass/version.h.in b/include/version.h.in → include/grass/version.h.in
diff --git a/mswindows/osgeo4w/config.h.vc b/mswindows/osgeo4w/config.h.vc
@@ -1,4 +1,4 @@
-/* include/config.h.  modified mingw version for VC */
+/* include/grass/config.h.  modified mingw version for VC */
 
 /*
  * config.h.in