diff options
| author | Niels de Vos <ndevos@redhat.com> | 2017-10-10 13:23:50 +0200 |
|---|---|---|
| committer | Jeff Darcy <jeff@pl.atyp.us> | 2017-10-13 16:28:55 +0000 |
| commit | a413c6353dbfff5221ea020ff8e1475d5ee17a81 (patch) | |
| tree | c09014d0d29fe99edff678c5861da13e1986febb /Makefile.am | |
| parent | c64fd0d4b0ef313bb44aae68a376ec0c9ee8657a (diff) | |
build: make it possible to build cleanly 2x in a row
'make clean' does not cleanup everything, and some of the files get
cleaned too eagerly. Several files are being packaged in a 'make dist'
tarball, that get rebuild each time anyway.
Specifically, this change prevents
- libglusterfs/src/generator.pyc from laying around
- keeping rpc/xdr/gen/*.x symlinks
- modifying tests/basic/{fuse,gfapi}/Makefile each run
- including tests/env.rc and events/src/eventtypes.py in the tarball
Change-Id: I774dd1abf3a9d3b6a89b938cf6ee7d7792c59a82
BUG: 1501317
Reported-by: Patrick Matthäi <pmatthaei@debian.org>
Signed-off-by: Niels de Vos <ndevos@redhat.com>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index e4172159875..bbf121a0059 100644 --- a/Makefile.am +++ b/Makefile.am @@ -22,7 +22,7 @@ pkgconfig_DATA += libgfdb.pc endif CLEANFILES = glusterfs-api.pc libgfchangelog.pc libgfdb.pc \ - tests/env.rc contrib/umountd/Makefile{,.in} + tests/env.rc contrib/umountd/Makefile CONFIG_CLEAN_FILES = $(CONTRIB_BUILDDIR)/uuid/uuid_types.h gitclean: distclean @@ -41,10 +41,14 @@ gitclean: distclean -rm -f $(CONTRIBDIR)/argp-standalone/install-sh -rm -f $(CONTRIBDIR)/argp-standalone/missing +# dist-hook gets executed with 'make dist', this is the only target getting +# executed, a dist-hook in other Makefile.am files seem to get ignored. dist-hook: gen-VERSION gen-ChangeLog -rm -fr $(distdir)/contrib/argp-standalone/autom4te.cache -rm -fr $(distdir)/contrib/argp-standalone/.deps -rm -fr $(distdir)/contrib/umountd/.deps + -rm -f $(distdir)/events/src/eventtypes.py + -rm -f $(distdir)/tests/env.rc -cp -f $(top_srcdir)/build-aux/config.sub.dist $(distdir)/config.sub -cp -f $(top_srcdir)/build-aux/config.guess.dist $(distdir)/config.guess |