updated clean rules

diff --git a/Makefile.am b/Makefile.am
index c9e9e01..fc8781c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 SUBDIRS = src examples doc sounds swig python plugins
 EXTRA_DIST = bootstrap VERSION
 SUBDIRS = src examples doc sounds swig python plugins
 EXTRA_DIST = bootstrap VERSION

+DISTCLEANFILES = autom4te.cache

 
 docs:
        cd doc && make update-docs && cd ..
 
 docs:
        cd doc && make update-docs && cd ..


@@ -24,5 +25,3 @@ uninstall-pkgconfig:
 install-data-hook: install-pkgconfig
 uninstall-hook: uninstall-pkgconfig
 
 install-data-hook: install-pkgconfig
 uninstall-hook: uninstall-pkgconfig
 

-distclean:
-       rm -rf autom4te.cache

diff --git a/Makefile.in b/Makefile.in
index b1fbb72..1b08cb6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -153,6 +153,7 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 SUBDIRS = src examples doc sounds swig python plugins
 EXTRA_DIST = bootstrap VERSION
 target_alias = @target_alias@
 SUBDIRS = src examples doc sounds swig python plugins
 EXTRA_DIST = bootstrap VERSION

+DISTCLEANFILES = autom4te.cache

 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs


@@ -478,6 +479,7 @@ clean-generic:
 
 distclean-generic:
        -rm -f $(CONFIG_CLEAN_FILES)
 
 distclean-generic:
        -rm -f $(CONFIG_CLEAN_FILES)

+       -test -z "$(DISTCLEANFILES)" || rm -f $(DISTCLEANFILES)

 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"
 
 maintainer-clean-generic:
        @echo "This command is intended for maintainers to use"


@@ -577,9 +579,6 @@ uninstall-pkgconfig:
 
 install-data-hook: install-pkgconfig
 uninstall-hook: uninstall-pkgconfig
 
 install-data-hook: install-pkgconfig
 uninstall-hook: uninstall-pkgconfig

-
-distclean:
-       rm -rf autom4te.cache

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:

diff --git a/doc/Makefile.am b/doc/Makefile.am
index d6270fc..2efde6e 100644 (file)
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -45,4 +45,4 @@ man:
 clean:
        rm -rf devel user examples *.1
 
 clean:
        rm -rf devel user examples *.1
 

-distclean: clean
+distclean-hook: clean

diff --git a/doc/Makefile.in b/doc/Makefile.in
index fb8ed24..4ddb492 100644 (file)
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -346,7 +346,7 @@ man:
 clean:
        rm -rf devel user examples *.1
 
 clean:
        rm -rf devel user examples *.1
 

-distclean: clean
+distclean-hook: clean

 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT: