build: `make distclean` doesn't clean all it ought to, needs to

Debian builds fail to "build twice in a row" due to left over files
remaining after running `make distclean`

The main culprits are files created from *.in files during ./configure.
In particular these are ./glusterfs-api.pc, ./libgfchangelog.pc,
./libgfdb.pc, and ./tests/env.rc.

The strange one is contrib/umountd/Makefile{,.in}. While these are
created by ./configure - for reasons I don't quite fathom, perhaps
because contrib/umountd is included in EXTRA_DIST - after that
make and make distclean don't descend into the directory to build or
clean it (because it's not needed for Linux, and not built.)

Also removing the `find . -name Makefile -exec rm -f {}\;` from the
gitclean target, it's not needed (redundant) as its prereq distclean
target will have already removed them.

Change-Id: Ifc45b71d852052ef4b92f356279ce2ba2bbc5bb6
BUG: 1279836
Signed-off-by: Kaleb S KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/12579
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Tested-by: Milind Changire <mchangir@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>

diff --git a/Makefile.am b/Makefile.am
index 5bfe07c4abfe42a32ca42581fc49c42a86926ccc..1201ca2319bd6832ea1ac59531f1537ca8a67f25 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,14 +20,12 @@ if USE_GFDB
 pkgconfig_DATA += libgfdb.pc
 endif
 
-CLEANFILES =
+CLEANFILES = glusterfs-api.pc libgfchangelog.pc libgfdb.pc \
+       tests/env.rc contrib/umountd/Makefile{,.in}
 CONFIG_CLEAN_FILES = $(CONTRIB_BUILDDIR)/uuid/uuid_types.h
 
 gitclean: distclean
        find . -name Makefile.in -exec rm -f {} \;
-       find . -name Makefile \( ! -path "$(top_srcdir)/extras/FreeBSD/*" \
-               ! -path "$(top_srcdir)/extras/command-completion/*" \
-               ! -path "$(top_srcdir)/extras/test/*" \) -exec rm -f {} \;
        find . -name mount.glusterfs -exec rm -f {} \;
        rm -fr autom4te.cache
        rm -f missing aclocal.m4 config.h.in config.guess config.sub ltmain.sh install-sh configure depcomp