diff options
author | Kaleb S KEITHLEY <kkeithle@redhat.com> | 2015-11-13 14:27:48 -0500 |
---|---|---|
committer | Niels de Vos <ndevos@redhat.com> | 2015-11-16 00:47:42 -0800 |
commit | 24f2173e391a517901750138db95bff3f0bd026e (patch) | |
tree | 655a3ce69ceb1aac6e53ae2a3e625759fc3485e5 /Makefile.am | |
parent | ab0152f08dc9c190afa237a877345969b6f399f7 (diff) |
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 <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/12580
Tested-by: NetBSD Build System <jenkins@build.gluster.org>
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Milind Changire <mchangir@redhat.com>
Reviewed-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 5 |
1 files 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 |