Improve adherence to consistent directory structure

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

db/Makefile

@@ -3,8 +3,19 @@ MODULE_TOPDIR = ..
 
 SUBDIRS = \
 	drivers \
-	base \
-	db.login
+	db.columns \
+	db.connect \
+	db.copy \
+	db.createdb \
+	db.databases \
+	db.describe \
+	db.drivers \
+	db.dropdb \
+	db.droptable \
+	db.execute \
+	db.login \
+	db.select \
+	db.tables
 
 PGM = databaseintro
 

db/base/Makefile

@@ -1,22 +0,0 @@
-
-MODULE_TOPDIR = ../..
-
-LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
-DEPENDENCIES = $(GISDEP) $(DBMIDEP)
-
-#not used: db.createdb db.dropdb db.databases db.droptable
-PROGRAMS = db.columns db.copy db.describe db.drivers db.execute db.select db.tables db.connect
-
-db_columns_OBJS = columns.o
-db_copy_OBJS = copy.o
-db_describe_OBJS = describe.o printtab.o
-db_drivers_OBJS = drivers.o
-db_execute_OBJS = execute.o
-db_select_OBJS = select.o printtab.o
-db_tables_OBJS = tables.o
-db_connect_OBJS = connect.o
-
-include $(MODULE_TOPDIR)/include/Make/Multi.make
-
-default: multi
-

db/db.columns/Makefile

@@ -0,0 +1,12 @@
+
+MODULE_TOPDIR = ../..
+
+LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+
+PGM = db.columns
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+default: cmd
+

db/db.connect/Makefile

@@ -0,0 +1,12 @@
+
+MODULE_TOPDIR = ../..
+
+LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+
+PGM = db.connect
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+default: cmd
+

db/db.copy/Makefile

@@ -0,0 +1,12 @@
+
+MODULE_TOPDIR = ../..
+
+LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+
+PGM = db.copy
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+default: cmd
+

db/db.createdb/Makefile

@@ -0,0 +1,12 @@
+
+MODULE_TOPDIR = ../..
+
+LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+
+PGM = db.createdb
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+default: cmd
+

db/db.databases/Makefile

@@ -0,0 +1,12 @@
+
+MODULE_TOPDIR = ../..
+
+LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+
+PGM = db.databases
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+default: cmd
+

db/db.describe/Makefile

@@ -0,0 +1,12 @@
+
+MODULE_TOPDIR = ../..
+
+LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+
+PGM = db.describe
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+default: cmd
+

db/db.drivers/Makefile

@@ -0,0 +1,12 @@
+
+MODULE_TOPDIR = ../..
+
+LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+
+PGM = db.drivers
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+default: cmd
+

db/db.dropdb/Makefile

@@ -0,0 +1,12 @@
+
+MODULE_TOPDIR = ../..
+
+LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+
+PGM = db.dropdb
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+default: cmd
+

db/db.droptable/Makefile

@@ -0,0 +1,12 @@
+
+MODULE_TOPDIR = ../..
+
+LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+
+PGM = db.droptable
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+default: cmd
+

db/db.execute/Makefile

@@ -0,0 +1,12 @@
+
+MODULE_TOPDIR = ../..
+
+LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+
+PGM = db.execute
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+default: cmd
+

db/db.select/Makefile

@@ -0,0 +1,12 @@
+
+MODULE_TOPDIR = ../..
+
+LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+
+PGM = db.select
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+default: cmd
+

db/db.select/local_proto.h

@@ -0,0 +1,8 @@
+#ifndef __LOCAL_PROTO_H__
+#define __LOCAL_PROTO_H__
+
+int print_priv(char *, int);
+int print_column_definition(dbColumn *);
+int print_table_definition(dbDriver *, dbTable *);
+
+#endif /* __LOCAL_PROTO_H__ */

db/db.select/printtab.c

@@ -0,0 +1,78 @@
+#include <grass/gis.h>
+#include <grass/dbmi.h>
+#include "local_proto.h"
+#include <grass/glocale.h>
+
+int print_table_definition(dbDriver * driver, dbTable * table)
+{
+    int ncols, col, nrows;
+    dbColumn *column;
+    char buf[1024];
+    dbString stmt;
+
+    fprintf(stdout, "table:%s\n", db_get_table_name(table));
+    fprintf(stdout, "description:%s\n", db_get_table_description(table));
+    print_priv("insert", db_get_table_insert_priv(table));
+    print_priv("delete", db_get_table_delete_priv(table));
+
+    ncols = db_get_table_number_of_columns(table);
+
+    db_init_string(&stmt);
+    sprintf(buf, "select * from %s", db_get_table_name(table));
+    db_set_string(&stmt, buf);
+    nrows = db_get_table_number_of_rows(driver, &stmt);
+    fprintf(stdout, "ncols:%d\n", ncols);
+    fprintf(stdout, "nrows:%d\n", nrows);
+    for (col = 0; col < ncols; col++) {
+	column = db_get_table_column(table, col);
+	fprintf(stdout, "\n");
+	print_column_definition(column);
+    }
+
+    return 0;
+}
+
+int print_column_definition(dbColumn * column)
+{
+    dbString value_string;
+
+    fprintf(stdout, "column:%s\n", db_get_column_name(column));
+    fprintf(stdout, "description:%s\n", db_get_column_description(column));
+    fprintf(stdout, "type:%s\n",
+	    db_sqltype_name(db_get_column_sqltype(column)));
+    fprintf(stdout, "len:%d\n", db_get_column_length(column));
+    fprintf(stdout, "scale:%d\n", db_get_column_scale(column));
+    fprintf(stdout, "precision:%d\n", db_get_column_precision(column));
+    fprintf(stdout, "default:");
+    if (db_test_column_has_default_value(column)) {
+	db_init_string(&value_string);
+	db_convert_column_default_value_to_string(column, &value_string);
+	fprintf(stdout, "%s", db_get_string(&value_string));
+    }
+    fprintf(stdout, "\n");
+    fprintf(stdout, "nullok:%s\n",
+	    db_test_column_null_allowed(column) ? "yes" : "no");
+    print_priv("select", db_get_column_select_priv(column));
+    print_priv("update", db_get_column_update_priv(column));
+
+    return 0;
+}
+
+int print_priv(char *label, int priv)
+{
+    fprintf(stdout, "%s:", label);
+    switch (priv) {
+    case DB_GRANTED:
+	fprintf(stdout, "yes");
+	break;
+    case DB_NOT_GRANTED:
+	fprintf(stdout, "no");
+	break;
+    default:
+	fprintf(stdout, "?");
+	break;
+    }
+    fprintf(stdout, "\n");
+
+    return 0;
+}

db/db.tables/Makefile

@@ -0,0 +1,12 @@
+
+MODULE_TOPDIR = ../..
+
+LIBES = $(DBMILIB) $(GISLIB) $(DATETIMELIB)
+DEPENDENCIES = $(GISDEP) $(DBMIDEP)
+
+PGM = db.tables
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+default: cmd
+

raster/Makefile

@@ -29,11 +29,12 @@ SUBDIRS = \
 	r.in.arc \
 	r.in.ascii \
 	r.in.bin \
-	r.info \
+	r.in.gdal \
 	r.in.gridatb \
 	r.in.mat \
 	r.in.poly \
 	r.in.xyz \
+	r.info \
 	r.kappa \
 	r.lake \
 	r.li \
@@ -46,12 +47,15 @@ SUBDIRS = \
 	r.out.arc \
 	r.out.ascii \
 	r.out.bin \
+	r.out.gdal \
 	r.out.gridatb \
 	r.out.mat \
 	r.out.mpeg \
+	r.out.png \
 	r.out.pov \
 	r.out.ppm \
 	r.out.ppm3 \
+	r.out.tiff \
 	r.out.vrml \
 	r.out.vtk \
 	r.param.scale \
@@ -67,14 +71,17 @@ SUBDIRS = \
 	r.recode \
 	r.region \
 	r.report \
-	r.resample \
 	r.resamp.interp \
 	r.resamp.rst \
 	r.resamp.stats \
+	r.resample \
 	r.rescale \
 	r.rescale.eq \
+	r.ros \
 	r.series \
 	r.slope.aspect \
+	r.spread \
+	r.spreadpath \
 	r.statistics \
 	r.statistics2 \
 	r.statistics3 \
@@ -85,10 +92,12 @@ SUBDIRS = \
 	r.support.stats \
 	r.surf.area \
 	r.surf.contour \
+	r.surf.fractal \
+	r.surf.gauss \
 	r.surf.idw \
 	r.surf.idw2 \
 	r.surf.random \
-	r.surf.gauss \
+	r.terraflow \
 	r.texture \
 	r.thin \
 	r.timestamp \
@@ -106,14 +115,7 @@ SUBDIRS = \
 	r.water.outlet \
 	r.watershed \
 	r.what \
-	r.what.color \
-	wildfire \
-	r.in.gdal \
-	r.out.gdal \
-	r.surf.fractal \
-	r.out.png \
-	r.terraflow \
-	r.out.tiff
+	r.what.color
 
 #	r.le \
 

raster/wildfire/r.ros/Makefile

@@ -1,4 +1,4 @@
-MODULE_TOPDIR = ../../..
+MODULE_TOPDIR = ../..
 
 PGM = r.ros
 

raster/wildfire/r.spread/Makefile

@@ -1,4 +1,4 @@
-MODULE_TOPDIR = ../../..
+MODULE_TOPDIR = ../..
 
 PGM = r.spread
 

raster/wildfire/r.spreadpath/Makefile

@@ -1,4 +1,4 @@
-MODULE_TOPDIR = ../../..
+MODULE_TOPDIR = ../..
 
 PGM = r.spreadpath
 

raster3d/Makefile

@@ -2,14 +2,16 @@ MODULE_TOPDIR = ..
 
 SUBDIRS = \
 	r3.cross.rast \
+	r3.gwflow \
 	r3.in.ascii \
 	r3.in.v5d \
-	r3.gwflow \
+	r3.info \
 	r3.mkdspf \
 	r3.out.ascii \
 	r3.out.v5d \
 	r3.out.vtk \
 	r3.stats \
+	r3.timestamp \
 	r3.to.rast \
 	base
 

raster3d/base/Makefile

@@ -4,12 +4,10 @@ MODULE_TOPDIR = ../..
 LIBES = $(G3DLIB) $(GISLIB)
 DEPENDENCIES = $(G3DDEP) $(GISDEP)
 
-PROGRAMS = r3.info r3.mask r3.null r3.timestamp
+PROGRAMS = r3.mask r3.null
 
 r3_mask_OBJS = r3.mask.main.o mask_functions.o
 r3_null_OBJS = r3.null.main.o mask_functions.o
-r3_info_OBJS = r3.info.main.o
-r3_timestamp_OBJS = r3.timestamp.main.o
 
 include $(MODULE_TOPDIR)/include/Make/Multi.make
 

raster3d/r3.info/Makefile

@@ -0,0 +1,10 @@
+MODULE_TOPDIR = ../..
+
+PGM=r3.info
+
+LIBES = $(G3DLIB) $(GISLIB)
+DEPENDENCIES = $(G3DDEP) $(GISDEP)
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+default: cmd

raster3d/r3.timestamp/Makefile

@@ -0,0 +1,10 @@
+MODULE_TOPDIR = ../..
+
+PGM=r3.timestamp
+
+LIBES = $(G3DLIB) $(GISLIB)
+DEPENDENCIES = $(G3DDEP) $(GISDEP)
+
+include $(MODULE_TOPDIR)/include/Make/Module.make
+
+default: cmd