Make sure "make clean" really cleans what's created by "make"

Fixes #4531 and simplifies a little bit those Makefiles

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

diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index 40c8c4f06105559845a83533233cca6724672244..3c64b47df931bcf4a8901f2600c58c82adf3e9b2 100644 (file)
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -50,7 +50,7 @@ all:  sql/address_standardizer.sql sql/address_standardizer--1.0--$(EXTVERSION).
 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/
 
 
 

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index f942219eadc5a858903cfb1452c3f460bcd4fd53..9acf25ed0d9263ec4305a3144126fe6163943ab8 100644 (file)
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -62,8 +62,7 @@ RASTER_DROP_SCRIPTS = \
        ../../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@
 

diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in
index ed50c172feb1d357741ecf023a09119a424beb7f..5ccbfe0afe52462a3fee922f25685adbda506319 100644 (file)
--- a/extensions/postgis_raster/Makefile.in
+++ b/extensions/postgis_raster/Makefile.in
@@ -54,8 +54,7 @@ EXTENSION_UPGRADE_SCRIPTS = \
 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@
 

diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in
index 31e92404ffb623b4953326eccad9ebafa6863775..e50e8bf08529e8ed40d5a4fedbbc9a0550da22c4 100644 (file)
--- a/extensions/postgis_sfcgal/Makefile.in
+++ b/extensions/postgis_sfcgal/Makefile.in
@@ -39,8 +39,7 @@ EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \
        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
 

diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index 15c9ced93c67162d114fc5bef02bc320d7630c46..446638a8da07eae52778c329d916e8de2366fa8c 100644 (file)
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -32,7 +32,7 @@ REGRESS = test-normalize_address test-upgrade
 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)

diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index feeea22e4541348aaea981cc3d79d55a2c2d5632..3b271a4946d7f2acc6982bde2b02863611c83348 100644 (file)
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -41,7 +41,7 @@ EXTENSION_UPGRADE_SCRIPTS = \
        ../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