From: Bborie Park <bkpark at ucdavis.edu>
Date: Tue, 20 Dec 2011 02:58:11 +0000 (+0000)
Subject: Correct handling of make target "distclean".  Next is "uninstall".
X-Git-Tag: 2.0.0alpha1~400
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ccf13f986253bc10769c017900d3090aabf12b7a;p=postgis

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 0f9902c83..fd1940423 100644
--- 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 ae7bb5303..f10b194bf 100644
--- 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 abafde868..816d02cd2 100644
--- 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 b748ba5d2..5d4aa605f 100644
--- 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 bbb8e174d..f209e3e43 100644
--- 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 d154d639c..380ac66ca 100644
--- 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 733517644..5d3a45732 100644
--- 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 fee90f8d9..ce71eff9e 100644
--- 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