From cf8753bd36eb767e206396f1e5a109ef7899d301 Mon Sep 17 00:00:00 2001 From: Paul Ramsey Date: Wed, 21 Mar 2012 20:32:29 +0000 Subject: [PATCH] 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 --- GNUmakefile.in | 1 + doc/Makefile.in | 10 +++++++--- doc/html/image_src/Makefile.in | 3 +++ extensions/postgis/Makefile.in | 3 +++ extensions/postgis_topology/Makefile.in | 3 +++ liblwgeom/Makefile.in | 1 + libpgcommon/Makefile.in | 11 ++++++----- libpgcommon/cunit/Makefile.in | 5 ++++- loader/Makefile.in | 8 ++++++-- loader/cunit/Makefile.in | 3 +++ postgis/Makefile.in | 3 +++ raster/Makefile.in | 2 +- raster/loader/Makefile.in | 6 +++--- raster/rt_core/Makefile.in | 6 +++--- raster/scripts/Makefile.in | 2 +- raster/scripts/python/Makefile.in | 3 ++- raster/test/Makefile.in | 4 +++- raster/test/core/Makefile.in | 4 ++-- raster/test/regress/Makefile.in | 7 +++++-- regress/Makefile.in | 5 ++++- topology/Makefile.in | 3 +++ 21 files changed, 67 insertions(+), 26 deletions(-) diff --git a/GNUmakefile.in b/GNUmakefile.in index 5410a1668..5140ebc46 100644 --- 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 15c187dcb..c105dfd2f 100644 --- 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 d433aebe9..032f8e313 100644 --- 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 0bb785586..29e33e6d6 100644 --- 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 c0fa33421..8206e8eac 100644 --- 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 872003c4c..ac3578b34 100644 --- 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 79237e8ca..cd8388dc0 100644 --- 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 76e688a66..47fb7d4f0 100644 --- 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 21e7ee234..ccf25974c 100644 --- 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 cd07017f4..534cca256 100644 --- 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 4c4a7d77a..20af1f0ab 100644 --- 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 fd1940423..43ad92d48 100644 --- 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 fcfc705c3..032f33d38 100644 --- 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 4392cc1ae..fa323deca 100644 --- 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 573c66471..3e3b9e3c2 100644 --- 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 380ac66ca..df08e5a5d 100644 --- 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 263c40edb..d35da3bcb 100644 --- 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 3bae040c9..86c4f451d 100644 --- 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 db727fc54..fb4486448 100644 --- 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 05dfee660..2ce359622 100644 --- 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 37627521f..fca0b1153 100644 --- 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 -- 2.40.0