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

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

diff --git a/.gitignore b/.gitignore
index efda711d7438011bbac27bad9a799620c321f388..21ce7f58083ab90f99a0f8573f4f30d6e1de95b1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -82,14 +82,10 @@ raster/raster_config.h
 raster/rt_core/Makefile
 raster/rt_pg/Makefile
 raster/rt_pg/rtpostgis_drop.sql
-raster/rt_pg/rtpostgis_drop.sql.in
 raster/rt_pg/rtpostgis_legacy.sql
-raster/rt_pg/rtpostgis_legacy.sql.in
 raster/rt_pg/rtpostgis.sql
-raster/rt_pg/rtpostgis.sql.in
 raster/rt_pg/rtpostgis_upgrade_20_minor.sql
 raster/rt_pg/rtpostgis_upgrade_cleanup.sql
-raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in
 raster/rt_pg/rtpostgis_upgrade.sql
 raster/rt_pg/uninstall_rtpostgis.sql
 raster/scripts/Makefile

diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in
index ff4e47722b806960ebce6c27711f104ffc0836e2..b9e3086722fb125f8b30c1e2b484759c50bd830b 100644 (file)
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
@@ -21,7 +21,7 @@ DATA=
 SQLPP = @SQLPP@
 
 # SQL objects (files requiring pre-processing)
-SQL_OBJS=rtpostgis.sql.in rtpostgis_drop.sql.in rtpostgis_upgrade_cleanup.sql.in rtpostgis_legacy.sql.in
+SQL_OBJS=rtpostgis.sql rtpostgis_drop.sql rtpostgis_upgrade_cleanup.sql rtpostgis_legacy.sql
 
 # Objects to build using PGXS
 OBJS=rt_pg.o
@@ -84,15 +84,16 @@ endif
 
 # Borrow the $libdir substitution from PGXS but customise by adding the version number
 %.sql: %.sql.in
-       $(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/rtpostgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@'g" $< > $@
+       $(SQLPP) -I../../postgis/ -I../../ $< | grep -v '^#' | \
+       $(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/rtpostgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@'g" > $@
 
 
 # Objects dependencies
 $(OBJS): ../../liblwgeom/.libs/liblwgeom.a ../../libpgcommon/libpgcommon.a ../../postgis_config.h ../../postgis_svn_revision.h
 
 # Generate any .sql.in files from .sql.in.c files by running them through the SQL pre-processor 
-$(SQL_OBJS): %.in: %.in.c
-       $(SQLPP) -I../../postgis/ -I../../ $< | grep -v '^#' > $@
+#$(SQL_OBJS): %.in: %.in.c
+#      $(SQLPP) -I../../postgis/ -I../../ $< | grep -v '^#' > $@
 
 # SQL objects deps here
 $(SQL_OBJS): ../../postgis/sqldefines.h ../../postgis_svn_revision.h

diff --git a/raster/rt_pg/rtpostgis.sql.in.c b/raster/rt_pg/rtpostgis.sql.in
similarity index 100%
rename from raster/rt_pg/rtpostgis.sql.in.c
rename to raster/rt_pg/rtpostgis.sql.in

diff --git a/raster/rt_pg/rtpostgis_drop.sql.in.c b/raster/rt_pg/rtpostgis_drop.sql.in
similarity index 100%
rename from raster/rt_pg/rtpostgis_drop.sql.in.c
rename to raster/rt_pg/rtpostgis_drop.sql.in

diff --git a/raster/rt_pg/rtpostgis_legacy.sql.in.c b/raster/rt_pg/rtpostgis_legacy.sql.in
similarity index 100%
rename from raster/rt_pg/rtpostgis_legacy.sql.in.c
rename to raster/rt_pg/rtpostgis_legacy.sql.in

diff --git a/raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in.c b/raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in
similarity index 100%
rename from raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in.c
rename to raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in