Drop the .c suffix of sql files to preprocess under topology/ dir

git-svn-id: http://svn.osgeo.org/postgis/trunk@11180 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/topology/Makefile.in b/topology/Makefile.in
index 6ad2dcdbc773e96f4e81c6da120f363ee576ba94..487b0ebe10ba86b167730c40505e1f089af06d59 100644 (file)
--- a/topology/Makefile.in
+++ b/topology/Makefile.in
@@ -39,7 +39,7 @@ SQL_OBJS = \
   topology_drop_after.sql
 
 # Extra files to remove during 'make clean'
-EXTRA_CLEAN=$(SQL_OBJS) $(SQL_OBJS:.sql=.sql.in)
+EXTRA_CLEAN=$(SQL_OBJS)
 
 # PGXS information
 PG_CONFIG = @PGCONFIG@ 
@@ -76,11 +76,12 @@ endif
 # Unfortunately we have to copy this from the PGXS Makefile as it only gets picked up
 # if MODULE_big is defined
 %.sql: %.sql.in
-       $(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/$*'g" $< > $@
+       $(SQLPP) $< | grep -v '^#' | \
+       $(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/$*'g" > $@
 
 # Generate any .sql.in files from .sql.in.c files by running them through the SQL pre-processor 
-%.in: %.in.c
-       $(SQLPP) $< | grep -v '^#' > $@
+#%.in: %.in.c
+#      $(SQLPP) $< | grep -v '^#' > $@
        
 #Generate upgrade script by stripping things that can't be reinstalled
 #e.g. don't bother with tables, types, triggers, and domains
@@ -90,7 +91,7 @@ topology_upgrade.sql:  topology.sql
 topology_upgrade_$(PGIS_MAJ_MIN)_minor.sql:  topology_drop_before.sql topology_upgrade.sql topology_drop_after.sql
        cat $^ > $@
 
-topology.sql.in: sql/sqlmm.sql.in.c sql/populate.sql.in.c sql/polygonize.sql.in.c sql/gml.sql.in.c sql/query/getnodebypoint.sql.in.c sql/query/getedgebypoint.sql.in.c sql/query/getfacebypoint.sql.in.c sql/query/GetRingEdges.sql.in.c sql/query/GetNodeEdges.sql.in.c sql/manage/TopologySummary.sql.in.c sql/manage/CopyTopology.sql.in.c sql/manage/ManageHelper.sql.in.c sql/topoelement/topoelement_agg.sql.in.c sql/topogeometry/type.sql.in.c sql/topogeometry/totopogeom.sql.in.c sql/topogeometry/cleartopogeom.sql.in.c sql/topogeometry/simplify.sql.in.c sql/predicates.sql.in.c ../postgis/sqldefines.h ../postgis_svn_revision.h
+topology.sql: sql/sqlmm.sql.in sql/populate.sql.in sql/polygonize.sql.in sql/gml.sql.in sql/query/getnodebypoint.sql.in sql/query/getedgebypoint.sql.in sql/query/getfacebypoint.sql.in sql/query/GetRingEdges.sql.in sql/query/GetNodeEdges.sql.in sql/manage/TopologySummary.sql.in sql/manage/CopyTopology.sql.in sql/manage/ManageHelper.sql.in sql/topoelement/topoelement_agg.sql.in sql/topogeometry/type.sql.in sql/topogeometry/totopogeom.sql.in sql/topogeometry/cleartopogeom.sql.in sql/topogeometry/simplify.sql.in sql/predicates.sql.in ../postgis/sqldefines.h ../postgis_svn_revision.h
 
 uninstall_topology.sql: topology.sql ../utils/create_undef.pl 
        $(PERL) ../utils/create_undef.pl $< $(POSTGIS_PGSQL_VERSION) > $@

diff --git a/topology/sql/gml.sql.in.c b/topology/sql/gml.sql.in
similarity index 100%
rename from topology/sql/gml.sql.in.c
rename to topology/sql/gml.sql.in

diff --git a/topology/sql/manage/CopyTopology.sql.in.c b/topology/sql/manage/CopyTopology.sql.in
similarity index 100%
rename from topology/sql/manage/CopyTopology.sql.in.c
rename to topology/sql/manage/CopyTopology.sql.in

diff --git a/topology/sql/manage/ManageHelper.sql.in.c b/topology/sql/manage/ManageHelper.sql.in
similarity index 100%
rename from topology/sql/manage/ManageHelper.sql.in.c
rename to topology/sql/manage/ManageHelper.sql.in

diff --git a/topology/sql/manage/TopologySummary.sql.in.c b/topology/sql/manage/TopologySummary.sql.in
similarity index 100%
rename from topology/sql/manage/TopologySummary.sql.in.c
rename to topology/sql/manage/TopologySummary.sql.in

diff --git a/topology/sql/polygonize.sql.in.c b/topology/sql/polygonize.sql.in
similarity index 100%
rename from topology/sql/polygonize.sql.in.c
rename to topology/sql/polygonize.sql.in

diff --git a/topology/sql/populate.sql.in.c b/topology/sql/populate.sql.in
similarity index 100%
rename from topology/sql/populate.sql.in.c
rename to topology/sql/populate.sql.in

diff --git a/topology/sql/predicates.sql.in.c b/topology/sql/predicates.sql.in
similarity index 100%
rename from topology/sql/predicates.sql.in.c
rename to topology/sql/predicates.sql.in

diff --git a/topology/sql/query/GetNodeEdges.sql.in.c b/topology/sql/query/GetNodeEdges.sql.in
similarity index 100%
rename from topology/sql/query/GetNodeEdges.sql.in.c
rename to topology/sql/query/GetNodeEdges.sql.in

diff --git a/topology/sql/query/GetRingEdges.sql.in.c b/topology/sql/query/GetRingEdges.sql.in
similarity index 100%
rename from topology/sql/query/GetRingEdges.sql.in.c
rename to topology/sql/query/GetRingEdges.sql.in

diff --git a/topology/sql/query/getedgebypoint.sql.in.c b/topology/sql/query/getedgebypoint.sql.in
similarity index 100%
rename from topology/sql/query/getedgebypoint.sql.in.c
rename to topology/sql/query/getedgebypoint.sql.in

diff --git a/topology/sql/query/getfacebypoint.sql.in.c b/topology/sql/query/getfacebypoint.sql.in
similarity index 100%
rename from topology/sql/query/getfacebypoint.sql.in.c
rename to topology/sql/query/getfacebypoint.sql.in

diff --git a/topology/sql/query/getnodebypoint.sql.in.c b/topology/sql/query/getnodebypoint.sql.in
similarity index 100%
rename from topology/sql/query/getnodebypoint.sql.in.c
rename to topology/sql/query/getnodebypoint.sql.in

diff --git a/topology/sql/sqlmm.sql.in.c b/topology/sql/sqlmm.sql.in
similarity index 100%
rename from topology/sql/sqlmm.sql.in.c
rename to topology/sql/sqlmm.sql.in

diff --git a/topology/sql/topoelement/topoelement_agg.sql.in.c b/topology/sql/topoelement/topoelement_agg.sql.in
similarity index 100%
rename from topology/sql/topoelement/topoelement_agg.sql.in.c
rename to topology/sql/topoelement/topoelement_agg.sql.in

diff --git a/topology/sql/topogeometry/cleartopogeom.sql.in.c b/topology/sql/topogeometry/cleartopogeom.sql.in
similarity index 100%
rename from topology/sql/topogeometry/cleartopogeom.sql.in.c
rename to topology/sql/topogeometry/cleartopogeom.sql.in

diff --git a/topology/sql/topogeometry/simplify.sql.in.c b/topology/sql/topogeometry/simplify.sql.in
similarity index 100%
rename from topology/sql/topogeometry/simplify.sql.in.c
rename to topology/sql/topogeometry/simplify.sql.in

diff --git a/topology/sql/topogeometry/totopogeom.sql.in.c b/topology/sql/topogeometry/totopogeom.sql.in
similarity index 100%
rename from topology/sql/topogeometry/totopogeom.sql.in.c
rename to topology/sql/topogeometry/totopogeom.sql.in

diff --git a/topology/sql/topogeometry/type.sql.in.c b/topology/sql/topogeometry/type.sql.in
similarity index 100%
rename from topology/sql/topogeometry/type.sql.in.c
rename to topology/sql/topogeometry/type.sql.in

diff --git a/topology/topology.sql.in.c b/topology/topology.sql.in
similarity index 98%
rename from topology/topology.sql.in.c
rename to topology/topology.sql.in
index 665a6dc689d160393f3a5810e8b2921216e0cb62..72d52ace012aae9f86c25f7cee63c03392b447ef 100644 (file)
--- a/topology/topology.sql.in.c
+++ b/topology/topology.sql.in
@@ -1963,44 +1963,44 @@ $$
 LANGUAGE 'plpgsql' VOLATILE STRICT;
 --} DropTopology
 
-#include "sql/manage/TopologySummary.sql.in.c"
-#include "sql/manage/CopyTopology.sql.in.c"
+#include "sql/manage/TopologySummary.sql.in"
+#include "sql/manage/CopyTopology.sql.in"
 
 -- Spatial predicates
-#include "sql/predicates.sql.in.c"
+#include "sql/predicates.sql.in"
 
 --  Querying
-#include "sql/query/getnodebypoint.sql.in.c"
-#include "sql/query/getedgebypoint.sql.in.c"
-#include "sql/query/getfacebypoint.sql.in.c"
+#include "sql/query/getnodebypoint.sql.in"
+#include "sql/query/getedgebypoint.sql.in"
+#include "sql/query/getfacebypoint.sql.in"
 
 --  Populating
-#include "sql/populate.sql.in.c"
-#include "sql/polygonize.sql.in.c"
+#include "sql/populate.sql.in"
+#include "sql/polygonize.sql.in"
 
 --  TopoElement
-#include "sql/topoelement/topoelement_agg.sql.in.c"
+#include "sql/topoelement/topoelement_agg.sql.in"
 
 --  TopoGeometry
-#include "sql/topogeometry/type.sql.in.c"
-#include "sql/topogeometry/cleartopogeom.sql.in.c"
-#include "sql/topogeometry/simplify.sql.in.c"
-#include "sql/topogeometry/totopogeom.sql.in.c"
+#include "sql/topogeometry/type.sql.in"
+#include "sql/topogeometry/cleartopogeom.sql.in"
+#include "sql/topogeometry/simplify.sql.in"
+#include "sql/topogeometry/totopogeom.sql.in"
 
 --  GML
-#include "sql/gml.sql.in.c"
+#include "sql/gml.sql.in"
 
 --=}  POSTGIS-SPECIFIC block
 
 --  SQL/MM block
-#include "sql/sqlmm.sql.in.c"
+#include "sql/sqlmm.sql.in"
 
 -- The following files needs getfaceedges_returntype, defined in sqlmm.sql
-#include "sql/query/GetRingEdges.sql.in.c"
-#include "sql/query/GetNodeEdges.sql.in.c"
+#include "sql/query/GetRingEdges.sql.in"
+#include "sql/query/GetNodeEdges.sql.in"
 
 --general management --
-#include "sql/manage/ManageHelper.sql.in.c"
+#include "sql/manage/ManageHelper.sql.in"
 
 CREATE OR REPLACE FUNCTION postgis_topology_scripts_installed() RETURNS text
        AS _POSTGIS_SQL_SELECT_POSTGIS_SCRIPTS_VERSION

diff --git a/topology/topology_drop_after.sql.in.c b/topology/topology_drop_after.sql.in
similarity index 100%
rename from topology/topology_drop_after.sql.in.c
rename to topology/topology_drop_after.sql.in

diff --git a/topology/topology_drop_before.sql.in.c b/topology/topology_drop_before.sql.in
similarity index 100%
rename from topology/topology_drop_before.sql.in.c
rename to topology/topology_drop_before.sql.in