Correct handling of make target "distclean". Next is "uninstall".

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

diff --git a/raster/Makefile.in b/raster/Makefile.in
index 0f9902c8328f2d16e2ca511b14ab62a4d4ac1173..fd1940423e88f1cecd780577daaa3e06cacc8be7 100644 (file)
--- a/raster/Makefile.in
+++ b/raster/Makefile.in
@@ -43,8 +43,12 @@ clean:
        $(MAKE) -C scripts $@
 
 distclean: clean
-       $(RM) -R autom4te.cache
-       $(RM) config.status
+       $(MAKE) -C rt_core $@
+       $(MAKE) -C rt_pg $@
+       $(MAKE) -C loader $@
+       $(MAKE) -C test $@
+       $(MAKE) -C scripts $@
+       $(RM) raster_config.h Makefile
 
 core-check:
        $(MAKE) -C test $@

diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in
index ae7bb5303e17afa65e4047e569f2a20652c150e0..f10b194bfeff5ef8bbe8eaf1be3a199cfc5c0c68 100644 (file)
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
@@ -72,7 +72,7 @@ $(RT_CORE)/librtcore.a:
        $(MAKE) -C ../rt_core
 
 clean:
-       @rm -f *.o $(RASTER2PGSQL)
+       $(RM) *.o $(RASTER2PGSQL)
 
 distclean: clean
        $(RM) Makefile

diff --git a/raster/rt_pg/.svnignore b/raster/rt_pg/.svnignore
index abafde868ed9fb65fe8df588c460c121de1970a0..816d02cd28aed0bd8396ae8d57a3bd8af2938510 100644 (file)
--- a/raster/rt_pg/.svnignore
+++ b/raster/rt_pg/.svnignore
@@ -5,3 +5,5 @@ rtpostgis_drop.sql
 rtpostgis_drop.sql.in
 rtpostgis_upgrade.sql
 rtpostgis_upgrade_20_minor.sql
+rtpostgis_upgrade_cleanup.sql
+rtpostgis_upgrade_cleanup.sql.in

diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in
index b748ba5d22eedad715ed246e5bd863a01250d688..5d4aa605f7fd859216bf663a8b2c399c8677f854 100644 (file)
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
@@ -12,7 +12,7 @@ MODULE_big=rtpostgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
 MODULEDIR=contrib/postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
 
 # Files to be copied to the contrib/ directory
-DATA_built=rtpostgis.sql rtpostgis_upgrade_20_minor.sql
+DATA_built=rtpostgis.sql rtpostgis_drop.sql rtpostgis_upgrade_20_minor.sql rtpostgis_upgrade_cleanup.sql
 DATA=
 
 # SQL objects (files requiring C pre-processing)

diff --git a/raster/scripts/Makefile.in b/raster/scripts/Makefile.in
index bbb8e174d9ce67090f38119bed35bce96f92efb7..f209e3e43cf7ba293f2788605ac261e1c58e4749 100644 (file)
--- a/raster/scripts/Makefile.in
+++ b/raster/scripts/Makefile.in
@@ -27,3 +27,8 @@ install:
 clean:
 #      $(MAKE) -C plpgsql $@
        $(MAKE) -C python $@
+
+distclean: clean
+#      $(MAKE) -C plpgsql $@
+       $(MAKE) -C python $@
+       $(RM) -f Makefile

diff --git a/raster/scripts/python/Makefile.in b/raster/scripts/python/Makefile.in
index d154d639cacd8a4cd19caf7b50a879b06dfb72e4..380ac66caef8ca7aef470ec2d080d94db1911670 100644 (file)
--- a/raster/scripts/python/Makefile.in
+++ b/raster/scripts/python/Makefile.in
@@ -25,3 +25,5 @@ uninstall:
 
 clean:
        $(RM) *.o
+
+distclean: clean

diff --git a/raster/test/Makefile.in b/raster/test/Makefile.in
index 733517644017bbb59c738d774eb85ab636b7f991..5d3a457325fe3b45f78b43b611d7a1a75d0375d8 100644 (file)
--- a/raster/test/Makefile.in
+++ b/raster/test/Makefile.in
@@ -24,3 +24,6 @@ $(RT_CORE)/librtcore.a:
 clean:
        $(MAKE) -C core $@
        $(MAKE) -C regress $@
+
+distclean: clean
+       $(RM) Makefile

diff --git a/raster/test/regress/Makefile.in b/raster/test/regress/Makefile.in
index fee90f8d9eff04fcab7980f56141ccd3fcbdbc1d..ce71eff9e7291d0cf555dc8c19aeda17e5d112f4 100644 (file)
--- a/raster/test/regress/Makefile.in
+++ b/raster/test/regress/Makefile.in
@@ -134,7 +134,7 @@ all:
        @echo "Use 'make check' to run all tests"
 
 clean distclean:
-       $(RM) -f rtpostgis.sql
+       $(RM) rtpostgis.sql
 
 rtpostgis.sql: ../../rt_pg/rtpostgis.sql
        sed 's,$$libdir,$(REGRESS_INSTALLDIR)/lib,g' ../../rt_pg/rtpostgis.sql > rtpostgis.sql