Fix the "maintainer-clean" rule, and avoid maven downloads on clean

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

diff --git a/GNUmakefile.in b/GNUmakefile.in
index a7492c06d6790caae34fc961411f00228b90db36..914b3fbcae26533609579ff57fc0efad32b6f9f0 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -38,15 +38,17 @@ check: all docs-check
 installcheck:
        RUNTESTFLAGS="$(RUNTESTFLAGS) --extension" $(MAKE) check
 
-distclean: clean distclean-local
+distclean: distclean-local
 
-distclean-local: clean
+distclean-local: clean-local
        rm -Rf autom4te.cache
        rm -f GNUmakefile
        rm -f config.log config.cache config.status 
        rm -f postgis_config.h
        rm -f java/jdbc/Makefile
 
+maintainer-clean-local: distclean-local
+
 maintainer-clean: 
        @echo '------------------------------------------------------'
        @echo 'This command is intended for maintainers to use; it'
@@ -56,7 +58,7 @@ maintainer-clean:
        $(MAKE) -C postgis maintainer-clean
        $(MAKE) -C liblwgeom maintainer-clean
        $(MAKE) -C java/jdbc maintainer-clean
-       $(MAKE) distclean
+       $(MAKE) maintainer-clean-local
        rm -f configure
 
 garden:

diff --git a/java/jdbc/Makefile.in b/java/jdbc/Makefile.in
index 9d6dffd86ce2507b5e0ca2b0dbc3776501a4cad4..cdb2488f827386e6f4476179a312c19cf18bb5f1 100644 (file)
--- a/java/jdbc/Makefile.in
+++ b/java/jdbc/Makefile.in
@@ -18,14 +18,15 @@ all: build
 pom.xml: pom.xml.in
        sed 's,%VERSION%,$(POSTGIS_LIB_VERSION),g' $< >$@
 
+# nothing to do on clean
+# (better not invoke ant here, as it downloads the world
 clean:
-       : nothing to do
 
 build: pom.xml
-
-build clean distclean check:
        $(ANT) $@
 
+distclean: clean
+
 maintainer-clean: distclean
        rm -f pom.xml
 

diff --git a/postgis/Makefile.in b/postgis/Makefile.in
index 00028bf79b5d6a610b4a33bfe7dfc28488976fa8..ac8550a36fdbd288067c8ebd276e6bff0c229910 100644 (file)
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -194,3 +194,5 @@ uninstall_sfcgal.sql: sfcgal.sql ../utils/create_undef.pl
 
 distclean: clean
        rm -f Makefile
+
+maintainer-clean: distclean