[postgis-tickets] r17890 - Make sure "make clean" really cleans what's created by "make"

[Sandro Santilli]

Author: strk
Date: 2019-10-08 04:40:36 -0700 (Tue, 08 Oct 2019)
New Revision: 17890

Modified:
   trunk/extensions/address_standardizer/Makefile.in
   trunk/extensions/postgis/Makefile.in
   trunk/extensions/postgis_raster/Makefile.in
   trunk/extensions/postgis_sfcgal/Makefile.in
   trunk/extensions/postgis_tiger_geocoder/Makefile.in
   trunk/extensions/postgis_topology/Makefile.in
Log:
Make sure "make clean" really cleans what's created by "make"

Fixes #4531 and simplifies a little bit those Makefiles

Modified: trunk/extensions/address_standardizer/Makefile.in
===================================================================
--- trunk/extensions/address_standardizer/Makefile.in	2019-10-08 10:59:05 UTC (rev 17889)
+++ trunk/extensions/address_standardizer/Makefile.in	2019-10-08 11:40:36 UTC (rev 17890)
@@ -50,7 +50,7 @@
 sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql \
 sql/test-init-extensions.sql sql/test-parseaddress.sql sql/test-standardize_address_1.sql sql/test-standardize_address_2.sql
 
-EXTRA_CLEAN += sql/*.sql
+EXTRA_CLEAN = sql/
 
 
 

Modified: trunk/extensions/postgis/Makefile.in
===================================================================
--- trunk/extensions/postgis/Makefile.in	2019-10-08 10:59:05 UTC (rev 17889)
+++ trunk/extensions/postgis/Makefile.in	2019-10-08 11:40:36 UTC (rev 17890)
@@ -62,8 +62,7 @@
 	../../raster/rt_pg/rtpostgis_drop.sql \
 	../../raster/rt_pg/uninstall_rtpostgis.sql
 
-SQL_BITS     = $(wildcard sql/*.sql)
-EXTRA_CLEAN += ${SQL_BITS} sql/*.sql
+EXTRA_CLEAN = sql/
 
 CURV_big=@POSTGIS_MAJOR_VERSION@@POSTGIS_MINOR_VERSION@
 

Modified: trunk/extensions/postgis_raster/Makefile.in
===================================================================
--- trunk/extensions/postgis_raster/Makefile.in	2019-10-08 10:59:05 UTC (rev 17889)
+++ trunk/extensions/postgis_raster/Makefile.in	2019-10-08 11:40:36 UTC (rev 17890)
@@ -54,8 +54,7 @@
 EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \
 	sql/rtpostgis.sql
 
-SQL_BITS     = $(wildcard sql/*.sql)
-EXTRA_CLEAN += ${SQL_BITS} sql/*.sql
+EXTRA_CLEAN = sql
 
 CURV_big=@POSTGIS_MAJOR_VERSION@@POSTGIS_MINOR_VERSION@
 

Modified: trunk/extensions/postgis_sfcgal/Makefile.in
===================================================================
--- trunk/extensions/postgis_sfcgal/Makefile.in	2019-10-08 10:59:05 UTC (rev 17889)
+++ trunk/extensions/postgis_sfcgal/Makefile.in	2019-10-08 11:40:36 UTC (rev 17890)
@@ -39,8 +39,7 @@
 	sql_bits/sfcgal.sql \
 	../../utils/create_unpackaged.pl
 
-SQL_BITS     = $(wildcard sql_bits/*.sql)
-EXTRA_CLEAN += sql/*.sql ${SQL_BITS}
+EXTRA_CLEAN = sql
 
 all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--ANY--$(EXTVERSION).sql
 

Modified: trunk/extensions/postgis_tiger_geocoder/Makefile.in
===================================================================
--- trunk/extensions/postgis_tiger_geocoder/Makefile.in	2019-10-08 10:59:05 UTC (rev 17889)
+++ trunk/extensions/postgis_tiger_geocoder/Makefile.in	2019-10-08 11:40:36 UTC (rev 17890)
@@ -32,7 +32,7 @@
 REGRESS_OPTS = --load-extension=fuzzystrmatch --load-extension=postgis --load-extension=$(EXTENSION)
 
 SQL_BITS     = $(wildcard sql_bits/*.sql)
-EXTRA_CLEAN += sql/*.sql ${SQL_BITS}
+EXTRA_CLEAN = sql ${SQL_BITS}
 
 #test address standardizer if also built
 ifeq (@ADDRESS_STANDARDIZER@,address_standardizer)

Modified: trunk/extensions/postgis_topology/Makefile.in
===================================================================
--- trunk/extensions/postgis_topology/Makefile.in	2019-10-08 10:59:05 UTC (rev 17889)
+++ trunk/extensions/postgis_topology/Makefile.in	2019-10-08 11:40:36 UTC (rev 17890)
@@ -41,7 +41,7 @@
 	../postgis_extension_helper_uninstall.sql
 
 SQL_BITS     = $(wildcard sql_bits/*.sql)
-EXTRA_CLEAN += sql/*.sql ${SQL_BITS}
+EXTRA_CLEAN = sql/ ${SQL_BITS}
 
 
 all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--ANY--$(EXTVERSION).sql