Make distclean should remove all the Makefile's generated by ./configure

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

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5410a16680c44b8f8b86be82a5627ea79cebd9fe..5140ebc465fcdecd9f83fe996ab6db0ee5416541 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -39,6 +39,7 @@ distclean: clean distclean-local
 
 distclean-local: clean
        rm -Rf autom4te.cache
+       rm -f GNUmakefile
        rm -f config.log config.cache config.status 
        rm -f postgis_config.h
 

diff --git a/doc/Makefile.in b/doc/Makefile.in
index 15c187dcb0ea9ee9adf787cf8fbb3f8aa251c51f..c105dfd2fe368b49af8a5e3bae6c2f0a503fb832 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -191,10 +191,14 @@ images-clean:
        $(MAKE) -C html/image_src images-clean
        
 clean: 
-       rm -f html/*.html
-       rm -f postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf
+       @rm -f html/*.html
+       @rm -f postgis-${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION}.${POSTGIS_MICRO_VERSION}.pdf
        $(MAKE) -C html/image_src clean
-       rm -f postgis-out.xml postgis_aggs_mm.xml
+       @rm -f postgis-out.xml postgis_aggs_mm.xml
+
+distclean: clean
+       $(MAKE) -C html/image_src distclean
+       @rm -f Makefile
 
 maintainer-clean: clean images-clean
        rm -f postgis_comments.sql raster_comments.sql topology_comments.sql tiger_geocoder_comments.sql

diff --git a/doc/html/image_src/Makefile.in b/doc/html/image_src/Makefile.in
index d433aebe98ee0dfd8b5de7dbb56909b6920b2f4f..032f8e313e215ecbe6746f96f7f2d1ae31c22243 100644 (file)
--- a/doc/html/image_src/Makefile.in
+++ b/doc/html/image_src/Makefile.in
@@ -165,6 +165,9 @@ clean:
        rm -f generator
        rm -f tmp[0-9].png
 
+distclean: clean
+       @rm -f Makefile
+
 images-clean:
        rm -f $(IMAGES) $(IMAGES_RESIZED)
 

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 0bb785586e711ce885fd2bd69856af223b75d556..29e33e6d6683a7fddcc7933b434498b146bcf09b 100644 (file)
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -141,5 +141,8 @@ DATA = $(wildcard sql/*--*.sql) sql/$(EXTENSION)--$(EXTVERSION).sql
 EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql
 endif
 
+distclean:
+       @rm Makefile
+
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)

diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index c0fa33421b81b82ce395048a37a8846d4166ebba..8206e8eac38f7523a8de78e6ee2668ecda6a9b8a 100644 (file)
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -83,5 +83,8 @@ DATA = $(wildcard sql/*--*.sql) sql/$(EXTENSION)--$(EXTVERSION).sql
 EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql
 endif
 
+distclean:
+       @rm Makefile
+
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)

diff --git a/liblwgeom/Makefile.in b/liblwgeom/Makefile.in
index 872003c4c24637a8a3c2070e00324f894dd84abe..ac3578b340902f9e854c4307b5677a7e8d58473c 100644 (file)
--- a/liblwgeom/Makefile.in
+++ b/liblwgeom/Makefile.in
@@ -134,6 +134,7 @@ clean:
 distclean: clean
        $(MAKE) -C cunit distclean
        rm -f liblwgeom.h Makefile
+       rm -f Makefile
 
 check: liblwgeom.la
        $(MAKE) -C cunit check

diff --git a/libpgcommon/Makefile.in b/libpgcommon/Makefile.in
index 79237e8ca6bc445f6a0be64b134914231e2d047c..cd8388dc042cd2ea2d2371e9a77579614cac14cd 100644 (file)
--- a/libpgcommon/Makefile.in
+++ b/libpgcommon/Makefile.in
@@ -44,12 +44,13 @@ maintainer-clean: clean
 
 clean: 
        $(MAKE) -C cunit clean
-       rm -f $(SA_OBJS) 
-       rm -f $(NM_OBJS) 
-       rm -f libpgcommon.a 
+       @rm -f $(SA_OBJS) 
+       @rm -f $(NM_OBJS) 
+       @rm -f libpgcommon.a 
 
-# Nothing specific in distclean (will be done by clean)
-distclean:
+distclean: clean
+       $(MAKE) -C cunit distclean
+       @rm -f Makefile
 
 check: libpgcommon.a
        $(MAKE) -C cunit check

diff --git a/libpgcommon/cunit/Makefile.in b/libpgcommon/cunit/Makefile.in
index 76e688a66ba333a3e4864f847d81d367de3d5285..47fb7d4f054d3f756eed9be1986b86562210dd9e 100644 (file)
--- a/libpgcommon/cunit/Makefile.in
+++ b/libpgcommon/cunit/Makefile.in
@@ -10,4 +10,7 @@
 # *
 # **********************************************************************
 
-all check clean : 
\ No newline at end of file
+all check clean : 
+
+distclean: clean
+       @rm -f Makefile

diff --git a/loader/Makefile.in b/loader/Makefile.in
index 21e7ee2345feaa2974873c8bfbc96d57f1a92d8e..ccf25974c9c89a831890be72699e40b6a291ae0f 100644 (file)
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -132,10 +132,14 @@ ifdef gtk_build
 endif
 
 clean:
-       rm -rf .libs
-       rm -f *.o $(SHP2PGSQL-CLI) $(PGSQL2SHP-CLI) $(GTK_WIN32_RES) $(SHP2PGSQL-GUI)
+       @rm -rf .libs
+       @rm -f *.o $(SHP2PGSQL-CLI) $(PGSQL2SHP-CLI) $(GTK_WIN32_RES) $(SHP2PGSQL-GUI)
        $(MAKE) -C cunit clean
 
+distclean:
+       $(MAKE) -C cunit distclean
+       @rm -f Makefile
+
 
 #
 # Internationalization targets. These are going to need some work and 

diff --git a/loader/cunit/Makefile.in b/loader/cunit/Makefile.in
index cd07017f4d02f8fa5c9d957b6dceb579cb2ea2b5..534cca25686d04246b5cb72b6d31c69e51ff3c9d 100644 (file)
--- a/loader/cunit/Makefile.in
+++ b/loader/cunit/Makefile.in
@@ -85,6 +85,9 @@ clean:
        @rm -f $(OBJS)
        @rm -f cu_tester.exe
 
+distclean: clean
+       @rm -f Makefile
+
 # Requirements message
 requirements_not_met_cunit:
        @echo

diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index 4c4a7d77a3edff30e3fd9f286951fb7005e45c2e..20af1f0ab9362248bb37c425581b9f694636130c 100644 (file)
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -143,3 +143,6 @@ uninstall_postgis.sql: postgis.sql ../utils/create_undef.pl
 
 uninstall_legacy.sql: legacy.sql ../utils/create_undef.pl 
        $(PERL) ../utils/create_undef.pl $< $(POSTGIS_PGSQL_VERSION) > $@
+
+distclean:
+       @rm Makefile

diff --git a/raster/Makefile.in b/raster/Makefile.in
index fd1940423e88f1cecd780577daaa3e06cacc8be7..43ad92d484d4a479803492a096fe17f9b9b7eaed 100644 (file)
--- a/raster/Makefile.in
+++ b/raster/Makefile.in
@@ -48,7 +48,7 @@ distclean: clean
        $(MAKE) -C loader $@
        $(MAKE) -C test $@
        $(MAKE) -C scripts $@
-       $(RM) raster_config.h Makefile
+       @rm -f raster_config.h Makefile
 
 core-check:
        $(MAKE) -C test $@

diff --git a/raster/loader/Makefile.in b/raster/loader/Makefile.in
index fcfc705c327823e6325385cd934aa821bbb677f7..032f33d388ace63d4288f98577ef4466285a2895 100644 (file)
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
@@ -87,8 +87,8 @@ $(RT_CORE)/librtcore.a:
        $(MAKE) -C ../rt_core
 
 clean:
-       rm -rf .libs
-       $(RM) *.o $(RASTER2PGSQL)
+       @rm -rf .libs
+       @rm -f *.o $(RASTER2PGSQL)
 
 distclean: clean
-       $(RM) Makefile
+       @rm -f Makefile

diff --git a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in
index 4392cc1aefe43897536c7f49ec913f1c9a118537..fa323deca90194ef17b0d7f597f13a9f8fa16651 100644 (file)
--- a/raster/rt_core/Makefile.in
+++ b/raster/rt_core/Makefile.in
@@ -28,11 +28,11 @@ RT_HEADERS=rt_api.h
 all: $(RT_LIB)
 
 clean:
-       $(RM) $(RT_OBJS)
-       $(RM) $(RT_LIB)
+       @rm -f $(RT_OBJS)
+       @rm -f $(RT_LIB)
 
 distclean: clean
-       $(RM) Makefile
+       @rm -f Makefile
 
 librtcore.a: $(RT_OBJS) $(RT_HEADERS)
        $(AR) $(RT_LIB) $(RT_OBJS)

diff --git a/raster/scripts/Makefile.in b/raster/scripts/Makefile.in
index 573c66471badbcba76170c693450ad027d9766cc..3e3b9e3c2f4517830cab614ac5b1eb8fb0982a87 100644 (file)
--- a/raster/scripts/Makefile.in
+++ b/raster/scripts/Makefile.in
@@ -33,4 +33,4 @@ clean:
 distclean: clean
 #      $(MAKE) -C plpgsql $@
        $(MAKE) -C python $@
-       $(RM) -f Makefile
+       @rm -f Makefile

diff --git a/raster/scripts/python/Makefile.in b/raster/scripts/python/Makefile.in
index 380ac66caef8ca7aef470ec2d080d94db1911670..df08e5a5dfcaa2d4f18c2239487823d94d60258c 100644 (file)
--- a/raster/scripts/python/Makefile.in
+++ b/raster/scripts/python/Makefile.in
@@ -24,6 +24,7 @@ uninstall:
 #      $(RM) $(DESTDIR)$(PGSQL_BINDIR)/$(RASTER2PGSQL)
 
 clean:
-       $(RM) *.o
+       @rm -f *.o
 
 distclean: clean
+       @rm -f Makefile

diff --git a/raster/test/Makefile.in b/raster/test/Makefile.in
index 263c40edbd66b438272ccb5702695ec09b0c1534..d35da3bcb1065a2dc040041c53dc0ae44188bd15 100644 (file)
--- a/raster/test/Makefile.in
+++ b/raster/test/Makefile.in
@@ -23,4 +23,6 @@ clean:
        $(MAKE) -C regress $@
 
 distclean: clean
-       $(RM) Makefile
+       $(MAKE) -C core $@
+       $(MAKE) -C regress $@
+       @rm -f Makefile

diff --git a/raster/test/core/Makefile.in b/raster/test/core/Makefile.in
index 3bae040c945b8ef21fdcf40505db58456dd8111c..86c4f451dd535c55378576e732a39edf99a48d71 100644 (file)
--- a/raster/test/core/Makefile.in
+++ b/raster/test/core/Makefile.in
@@ -66,7 +66,7 @@ $(RT_CORE)/librtcore.a:
 
 clean:
        rm -rf .libs
-       $(RM) *.o $(TESTAPI) $(TESTWKB)
+       @rm -f *.o $(TESTAPI) $(TESTWKB)
 
 distclean: clean
-       $(RM) Makefile
+       @rm -f Makefile

diff --git a/raster/test/regress/Makefile.in b/raster/test/regress/Makefile.in
index db727fc54bf9a69ba20140b80ff51c1e784146db..fb44864482aec48f98a2f6b70d4c184a8207e011 100644 (file)
--- a/raster/test/regress/Makefile.in
+++ b/raster/test/regress/Makefile.in
@@ -134,8 +134,11 @@ TESTS = $(TEST_METADATA) $(TEST_IO) $(TEST_FUNC) \
 all:
        @echo "Use 'make check' to run all tests"
 
-clean distclean:
-       $(RM) rtpostgis.sql
+distclean: clean
+       @rm -f Makefile
+
+clean:
+       $(RM) -f rtpostgis.sql
 
 rtpostgis.sql: ../../rt_pg/rtpostgis.sql
        sed 's,$$libdir,$(REGRESS_INSTALLDIR)/lib,g' ../../rt_pg/rtpostgis.sql > rtpostgis.sql

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 05dfee6602cbe80501e9be67a4a2eb37547e1509..2ce359622f0f6ea06868a3d56e4c96f64d4a2cd5 100644 (file)
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -147,7 +147,10 @@ ifeq ($(HAVE_JSON),yes)
                in_geojson 
 endif
 
-all install uninstall distclean:
+all install uninstall:
+
+distclean: clean
+       @rm Makefile
 
 staged-install-topology:
        @if test x"@TOPOLOGY@" != "x"; then \

diff --git a/topology/Makefile.in b/topology/Makefile.in
index 37627521f2e57c7104451b9443ec322a2a1d12ef..fca0b1153c5253cf60ba48534e595d97fa10c5ab 100644 (file)
--- a/topology/Makefile.in
+++ b/topology/Makefile.in
@@ -92,3 +92,6 @@ uninstall_topology.sql: topology.sql ../utils/create_undef.pl
 
 check: topology.sql
        $(MAKE) -C test $@
+
+distclean:
+       @rm Makefile