search for: cleanfil

By adding common CLEANFILES and DISTCLEANFILES variables to common-rules.mk, we can remove these from most other Makefiles, and also clean files more consistently. Note that bin_PROGRAMS are already cleaned by 'make clean', so I removed cases where these were unnecessarily added to CLEANFILES. --- .gitignore...

...ions(+), 13 deletions(-) diff --git a/docs/Makefile.am b/docs/Makefile.am index 1772c66..6b712e3 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -123,4 +123,4 @@ filter-links.pod: $(top_srcdir)/common-rules.mk $(srcdir)/make-links.sh filter 1 $(filters) > $@-t mv $@-t $@ -MAINTAINERCLEANFILES = plugin-links.pod filter-links.pod +DISTCLEANFILES = plugin-links.pod filter-links.pod diff --git a/tests/Makefile.am b/tests/Makefile.am index 4c7b59c..55db593 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -32,7 +32,8 @@ include $(top_srcdir)/common-rules.mk -MAINTAINERCLEANFILES...

On Thursday, 25 August 2016 15:53:32 CEST Richard W.M. Jones wrote: > By adding common CLEANFILES and DISTCLEANFILES variables to > common-rules.mk, we can remove these from most other Makefiles, and > also clean files more consistently. > > Note that bin_PROGRAMS are already cleaned by 'make clean', so I > removed cases where these were unnecessarily added to CLEANFIL...

POD errors are not nice, and 'pod2man --stderr' does not do what we want. Eric Blake (2): perl: Fix previous patches build: Kill build on POD error .gitignore | 2 ++ configure.ac | 10 +--------- docs/Makefile.am | 8 ++++++-- docs/nbdkit-plugin.pod | 2 +- plugins/curl/Makefile.am | 4 +++-

...12:45:46 +0200 Subject: [PATCH 3/3] build: arrange for "make distcheck" to pass * perl/Makefile.am (install-data-hook): Remove rule, for now. (clean-local): Use perl's "realclean" target, not "clean". The latter would fail to remove Makefile-pl.old. * Makefile.am (CLEANFILES): Define, to clean up after pod2html. * v2v/Makefile.am (CLEANFILES): Define, so that "make clean" removes generated *.1 files. * v2v/Makefile.am (virt-v2v.1): Don't redirect directly to $@. *** empty log message *** --- Makefile.am | 2 ++ perl/Makefile.am | 7 ++++---...

--- ruby/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ruby/Makefile.am b/ruby/Makefile.am index b6654d3..e78ab59 100644 --- a/ruby/Makefile.am +++ b/ruby/Makefile.am @@ -51,7 +51,7 @@ RUBY_SITEARCH := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['sitearchd install: $(MKDIR_P) $(DESTDIR)$(RUBY_SITELIB) $(MKDIR_P)

...+check_DATA = bindtests.bc $(test_progs_all) if HAVE_OCAMLOPT -noinst_DATA += bindtests.opt +check_DATA += bindtests.opt endif %.bc: %.cmo mlguestfs.cma @@ -204,6 +204,6 @@ install-data-hook: rm $(DESTDIR)$(OCAMLLIB)/guestfs/bindtests.* rm $(DESTDIR)$(OCAMLLIB)/guestfs/libguestfsocaml.a -CLEANFILES += $(noinst_DATA) +CLEANFILES += $(noinst_DATA) $(check_DATA) endif -- 2.5.0

...hu, Dec 13, 2018 at 08:55:41AM -0600, Eric Blake wrote: > diff --git a/tests/Makefile.am b/tests/Makefile.am > index 4c7b59c..55db593 100644 > --- a/tests/Makefile.am > +++ b/tests/Makefile.am > @@ -32,7 +32,8 @@ > > include $(top_srcdir)/common-rules.mk > > -MAINTAINERCLEANFILES = > +CLEANFILES = Because common-rules.mk defines CLEANFILES, this should be giving a warning. And also because of that ... > +CLEANFILES += \ > + test_ocaml_plugin.cmx \ > + test_ocaml_plugin.cmi \ > + test-ocaml-plugin.so ... this should not be necessary because the CLEANFILE...

Use CLEANFILES to remove the generated symlinks, and just ignore the errors when copying the scripts in srcdir!=builddir situations. Followup of commit 40ac54829d4e71b1bac76343872a2674a40c7ac0. --- bash/Makefile.am | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/bash/Makefile.am b/b...

...C) $(HOST_CFLAGS) $(HOST_LDFLAGS) mkinit.c -o $@ $(HOST_LIBS) +$(OBJ_NODES): nodes.h + nodes.h: mknodes nodetypes nodes.c.pat ./mknodes nodetypes nodes.c.pat @@ -73,7 +78,7 @@ mknodes: mknodes.c $(HOST_CC) $(HOST_CFLAGS) $(HOST_LDFLAGS) mknodes.c -o $@ $(HOST_LIBS) clean: - rm -f core $(CLEANFILES) $(PROG) $(OBJS) .*.d + rm -f core $(CLEANFILES) $(PROG) $(PROG).shared $(OBJS) .*.d spotless: clean find . -name \*~ -not -type d -print0 | xargs -0rt rm -f diff -p -purNx linux klibc-0.87.orig/ipconfig/Makefile klibc-0.87/ipconfig/Makefile --- klibc-0.87.orig/ipconfig/Makefile 2003-05-01 2...

Not very much related to each other. Rich.

This new series condenses all of the previously posted patches into new patch 1/2. The second patch is a new fix for parallel build in the haskell directory.

...7977334..476c059 100644 --- a/regedit/Makefile.am +++ b/regedit/Makefile.am @@ -39,6 +39,6 @@ $(top_builddir)/html/hivexregedit.1.html: hivexregedit --css 'pod.css' \ --htmldir html \ --outfile html/hivexregedit.1.html \ - regedit/hivexregedit + $(abs_srcdir)/hivexregedit CLEANFILES = $(man_MANS) diff --git a/sh/Makefile.am b/sh/Makefile.am index a6f5ae6..1c2aba8 100644 --- a/sh/Makefile.am +++ b/sh/Makefile.am @@ -71,7 +71,7 @@ $(top_builddir)/html/hivexget.1.html: hivexget.pod --css 'pod.css' \ --htmldir html \ --outfile html/hivexget.1.html \ - sh/hi...

...56 100644 --- a/src/metaflac/Makefile.am +++ b/src/metaflac/Makefile.am @@ -47,8 +47,6 @@ metaflac_LDADD = \ $(top_builddir)/src/share/getopt/libgetopt.la \ $(top_builddir)/src/share/utf8/libutf8.la \ $(top_builddir)/src/libFLAC/libFLAC.la \ - @OGG_LIBS@ \ - @LIBICONV@ \ - -lm + @LIBICONV@ CLEANFILES = metaflac.exe diff --git a/src/plugin_xmms/Makefile.am b/src/plugin_xmms/Makefile.am index 84c4106..ffb76a1 100644 --- a/src/plugin_xmms/Makefile.am +++ b/src/plugin_xmms/Makefile.am @@ -60,7 +60,6 @@ libxmms_flac_la_LIBADD = \ $(top_builddir)/src/share/utf8/libutf8.la \ $(top_builddir)/src/...

...PTS = run diff --git a/common-rules.mk b/common-rules.mk index 498d221..eb8c92e 100644 --- a/common-rules.mk +++ b/common-rules.mk @@ -18,6 +18,9 @@ # common-rules.mk is included in every Makefile.am. # subdir-rules.mk is included only in subdirectories. +# Convenient list terminator +NULL = + CLEANFILES = *~ $(generator_built): $(top_builddir)/generator/stamp-generator diff --git a/docs/Makefile.am b/docs/Makefile.am index f002541..234fff1 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -18,17 +18,20 @@ include $(top_srcdir)/subdir-rules.mk generator_built = \ - libnbd-api.pod + lib...

...tations, all the needed .pod files should be already there. --- po-docs/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/po-docs/Makefile.am b/po-docs/Makefile.am index a274898..bf10558 100644 --- a/po-docs/Makefile.am +++ b/po-docs/Makefile.am @@ -41,7 +41,9 @@ CLEANFILES = po4a.conf # language directory contains a Makefile.am that we need to keep up to # date (note each $lang/Makefile.am should be identical). # XXX Is there a better way? -SUBDIRS = $(linguas) +# The current directory is traversed first, to make sure that .pot and .pod +# files are up-to-date a...

...po-docs/$lang/Makefile.am should be # identical. If you create a new $lang.po, create the $lang/ # subdirectory and copy the Makefile.am from an existing language. +# All the actual logic should be in language.mk. -include $(top_srcdir)/subdir-rules.mk - -LINGUA = $(shell basename -- `pwd`) - -CLEANFILES = *.1 *.3 *.5 - -# Before 1.23.23, the old Perl tools were called *.pl. -CLEANFILES += *.pl - -MANPAGES = \ - guestfish.1 \ - guestfs.3 \ - guestfs-erlang.3 \ - guestfs-examples.3 \ - guestfs-faq.1 \ - guestfs-golang.3 \ - guestfs-java.3 \ - guestfs-lua.3 \ - guestfs-ocaml.3 \ - guestfs-performan...

...bin_PROGRAMS = guestfish +GENERATOR_ML = \ + cmds.c \ + completion.c + +.PHONY: force + +$(GENERATOR_ML): force + $(MAKE) -C $(top_builddir)/src stamp-generator + +BUILT_SOURCES = \ + $(GENERATOR_ML) \ + rc_protocol.h \ + rc_protocol.c + EXTRA_DIST = \ + $(BUILT_SOURCES) \ rc_protocol.x -CLEANFILES = rc_protocol.c rc_protocol.h - guestfish_SOURCES = \ + $(GENERATOR_ML) \ alloc.c \ - cmds.c \ - completion.c \ destpaths.c \ echo.c \ edit.c \ @@ -44,10 +56,6 @@ guestfish_SOURCES = \ librc_protocol_la_SOURCES = rc_protocol.c librc_protocol_la_CFLAGS = -Wall -Wno-unused -BUILT_SOURC...

...langpkg_DATA = \ pkg/$(GOOS)_$(GOARCH)/$(pkg).a pkg/$(GOOS)_$(GOARCH)/$(pkg).a: src/$(pkg)/guestfs.go + -[ $(srcdir) != $(builddir) ] && cp -rsu $(abs_srcdir)/src $(builddir)/src $(top_builddir)/run $(GOLANG) install $(pkg) golangsrc_DATA = $(source_files) @@ -57,4 +58,5 @@ endif CLEANFILES = *~ src/$(pkg)/*~ clean-local: + -[ $(srcdir) != $(builddir) ] && rm -rf $(builddir)/src rm -rf pkg -- 1.8.5.1

These changes allow virt-v2v to be compiled against the build directory of a non-installed libguestfs. Note that some small changes are also required to common and virt-v2v itself. I will post those separately. Rich.