From 24f2173e391a517901750138db95bff3f0bd026e Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Fri, 13 Nov 2015 14:27:48 -0500 Subject: 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: I99b93a227775c580f4a56c3d870a161d2937000d BUG: 1279345 Signed-off-by: Kaleb S KEITHLEY Reviewed-on: http://review.gluster.org/12580 Tested-by: NetBSD Build System Tested-by: Gluster Build System Reviewed-by: Milind Changire Reviewed-by: Niels de Vos --- Makefile.am | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 628bc482181..2865c6bc4d7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -20,12 +20,13 @@ 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 -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 -- cgit