From: Paul Ramsey Date: Wed, 21 Mar 2012 21:36:59 +0000 (+0000) Subject: Change @rm to rm for visibility X-Git-Tag: 2.0.0rc1~48 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=29e2d6a2997a1da80cf64f8c6338e36c36a7c1e8;p=postgis Change @rm to rm for visibility git-svn-id: http://svn.osgeo.org/postgis/trunk@9523 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/doc/Makefile.in b/doc/Makefile.in index c105dfd2f..fc3c0014c 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -191,14 +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 + 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 032f8e313..606b03355 100644 --- a/doc/html/image_src/Makefile.in +++ b/doc/html/image_src/Makefile.in @@ -166,7 +166,7 @@ clean: rm -f tmp[0-9].png distclean: clean - @rm -f Makefile + rm -f Makefile images-clean: rm -f $(IMAGES) $(IMAGES_RESIZED) diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in index 29e33e6d6..727f68848 100644 --- a/extensions/postgis/Makefile.in +++ b/extensions/postgis/Makefile.in @@ -141,8 +141,8 @@ DATA = $(wildcard sql/*--*.sql) sql/$(EXTENSION)--$(EXTVERSION).sql EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql endif -distclean: - @rm Makefile +distclean: clean + rm -f Makefile PGXS := $(shell $(PG_CONFIG) --pgxs) include $(PGXS) diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in index 8206e8eac..4d346027d 100644 --- a/extensions/postgis_topology/Makefile.in +++ b/extensions/postgis_topology/Makefile.in @@ -83,8 +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 +distclean: clean + rm Makefile PGXS := $(shell $(PG_CONFIG) --pgxs) include $(PGXS) diff --git a/libpgcommon/Makefile.in b/libpgcommon/Makefile.in index cd8388dc0..7071a0056 100644 --- a/libpgcommon/Makefile.in +++ b/libpgcommon/Makefile.in @@ -44,13 +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 distclean: clean $(MAKE) -C cunit distclean - @rm -f Makefile + rm -f Makefile check: libpgcommon.a $(MAKE) -C cunit check diff --git a/libpgcommon/cunit/Makefile.in b/libpgcommon/cunit/Makefile.in index 47fb7d4f0..5dad63918 100644 --- a/libpgcommon/cunit/Makefile.in +++ b/libpgcommon/cunit/Makefile.in @@ -13,4 +13,4 @@ all check clean : distclean: clean - @rm -f Makefile + rm -f Makefile diff --git a/loader/Makefile.in b/loader/Makefile.in index ccf25974c..75cacee01 100644 --- a/loader/Makefile.in +++ b/loader/Makefile.in @@ -132,13 +132,13 @@ 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 + rm -f Makefile # diff --git a/loader/cunit/Makefile.in b/loader/cunit/Makefile.in index 534cca256..9f1d8ee26 100644 --- a/loader/cunit/Makefile.in +++ b/loader/cunit/Makefile.in @@ -82,11 +82,11 @@ $(OBJS): %.o: %.c # Clean target clean: - @rm -f $(OBJS) - @rm -f cu_tester.exe + rm -f $(OBJS) + rm -f cu_tester.exe distclean: clean - @rm -f Makefile + rm -f Makefile # Requirements message requirements_not_met_cunit: diff --git a/postgis/Makefile.in b/postgis/Makefile.in index 20af1f0ab..b70cfe62a 100644 --- a/postgis/Makefile.in +++ b/postgis/Makefile.in @@ -144,5 +144,5 @@ 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 +distclean: clean + rm -f Makefile diff --git a/raster/Makefile.in b/raster/Makefile.in index 43ad92d48..a2b45509a 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 -f 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 032f33d38..ee3f1595b 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 -f *.o $(RASTER2PGSQL) + rm -rf .libs + rm -f *.o $(RASTER2PGSQL) distclean: clean - @rm -f Makefile + rm -f Makefile diff --git a/raster/rt_core/Makefile.in b/raster/rt_core/Makefile.in index fa323deca..941343226 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 -f $(RT_OBJS) - @rm -f $(RT_LIB) + rm -f $(RT_OBJS) + rm -f $(RT_LIB) distclean: clean - @rm -f Makefile + rm -f Makefile librtcore.a: $(RT_OBJS) $(RT_HEADERS) $(AR) $(RT_LIB) $(RT_OBJS) diff --git a/raster/rt_pg/Makefile.in b/raster/rt_pg/Makefile.in index 20ca9c42c..0fef806b0 100644 --- a/raster/rt_pg/Makefile.in +++ b/raster/rt_pg/Makefile.in @@ -105,4 +105,4 @@ uninstall_rtpostgis.sql: rtpostgis.sql ../../utils/create_undef.pl $(PERL) ../../utils/create_undef.pl $< $(POSTGIS_PGSQL_VERSION) > $@ distclean: clean - $(RM) Makefile + rm -f Makefile diff --git a/raster/scripts/Makefile.in b/raster/scripts/Makefile.in index 3e3b9e3c2..2798dfd45 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 df08e5a5d..3b49bbc0d 100644 --- a/raster/scripts/python/Makefile.in +++ b/raster/scripts/python/Makefile.in @@ -24,7 +24,7 @@ uninstall: # $(RM) $(DESTDIR)$(PGSQL_BINDIR)/$(RASTER2PGSQL) clean: - @rm -f *.o + rm -f *.o distclean: clean - @rm -f Makefile + rm -f Makefile diff --git a/raster/test/Makefile.in b/raster/test/Makefile.in index d35da3bcb..c67fa52a2 100644 --- a/raster/test/Makefile.in +++ b/raster/test/Makefile.in @@ -25,4 +25,4 @@ clean: distclean: clean $(MAKE) -C core $@ $(MAKE) -C regress $@ - @rm -f Makefile + rm -f Makefile diff --git a/raster/test/core/Makefile.in b/raster/test/core/Makefile.in index 86c4f451d..96a47a2ed 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 -f *.o $(TESTAPI) $(TESTWKB) + rm -f *.o $(TESTAPI) $(TESTWKB) distclean: clean - @rm -f Makefile + rm -f Makefile diff --git a/raster/test/regress/Makefile.in b/raster/test/regress/Makefile.in index fb4486448..e5df03980 100644 --- a/raster/test/regress/Makefile.in +++ b/raster/test/regress/Makefile.in @@ -135,7 +135,7 @@ all: @echo "Use 'make check' to run all tests" distclean: clean - @rm -f Makefile + rm -f Makefile clean: $(RM) -f rtpostgis.sql diff --git a/regress/Makefile.in b/regress/Makefile.in index 2ce359622..ad24faca2 100644 --- a/regress/Makefile.in +++ b/regress/Makefile.in @@ -150,7 +150,7 @@ endif all install uninstall: distclean: clean - @rm Makefile + rm Makefile staged-install-topology: @if test x"@TOPOLOGY@" != "x"; then \ diff --git a/topology/Makefile.in b/topology/Makefile.in index fca0b1153..70a5cc8a7 100644 --- a/topology/Makefile.in +++ b/topology/Makefile.in @@ -93,5 +93,5 @@ uninstall_topology.sql: topology.sql ../utils/create_undef.pl check: topology.sql $(MAKE) -C test $@ -distclean: - @rm Makefile +distclean: clean + rm -f Makefile