search for: generator_built

Patch 1/5 is a repost. Only change is title update. These fix parallel make on my machine, and additionally make building from subdirectories more correct.

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.

For convenience you can pull it from the 'build' branch in: git://heisenbug.com/matthew/libguestfs.git Matt

...eneral Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +include $(top_srcdir)/subdir-rules.mk + +generator_built = \ + errnostring-gperf.gperf \ + errnostring.c \ + errnostring.h + +BUILT_SOURCES = \ + $(generator_built) \ + errnostring-gperf.c + +EXTRA_DIST = \ + $(BUILT_SOURCES) + +noinst_LTLIBRARIES = liberrnostring.la + +# Build the errnostring perfect hash code. The generated code has lots +# of warning...

.../mlutils/oUnit-* +/mlv2v/.depend /mlvisit/.depend /mlvisit/visit_tests /mlxml/.depend diff --git a/mlv2v/Makefile.am b/mlv2v/Makefile.am index 9e82148..945f981 100644 --- a/mlv2v/Makefile.am +++ b/mlv2v/Makefile.am @@ -18,11 +18,74 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ - $(generator_built) + $(generator_built) \ + $(SOURCES_MLI) \ + $(SOURCES_ML) \ + $(SOURCES_C) -# Note: These are not compiled into a library. They are used directly -# by virt-v2v and are only located here because the files are -# generated (since the split). generator_built = \ uefi.mli \ uefi.ml + +SOURCES...

...t 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 + libnbd-api.pod \ + $(NULL) E...

*** BLURB HERE? *** Pino Toscano (6): build: stop shipping files generated by configure docs: fix out-of-source documentation build generator: do not generate mlv2v files when not needed perl: fix path to Build.PL rust: fix path to lib.rs rust: fix list of generator-built files daemon/Makefile.am | 8 ++++++-- docs/Makefile.am | 4 ++-- generator/main.ml | 11

...Makefile.am | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/rust/Makefile.am b/rust/Makefile.am > index edcccffa1..cb16e021f 100644 > --- a/rust/Makefile.am > +++ b/rust/Makefile.am > @@ -19,7 +19,7 @@ include $(top_srcdir)/subdir-rules.mk > > generator_built = \ > src/bin/bindtests.rs \ > - src/lib.rs > + src/guestfs.rs > > EXTRA_DIST = \ > $(generator_built) \ ACK series. Up to you what you want to do about patch 1. Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming...

...index e28a8b1..1aa2e0f 100644 --- a/gobject/Makefile.am +++ b/gobject/Makefile.am @@ -17,15 +17,19 @@ SUBDIRS = . docs +include $(top_srcdir)/subdir-rules.mk + include $(srcdir)/Makefile.inc -BUILT_SOURCES = \ - $(guestfs_gobject_headers) \ - $(guestfs_gobject_sources) \ - bindtests.js +generator_built = \ + $(guestfs_gobject_headers) \ + $(guestfs_gobject_sources) \ + bindtests.js + +BUILT_SOURCES = $(generator_built) EXTRA_DIST = \ - $(BUILT_SOURCES) \ + $(generator_built) \ TODO.txt \ bindtests-manual.js \ tests-misc.js \ diff --git a/gobject/Makefile.inc b/gobject/Makefile.inc index...

This just fixes 'make'. 'make check' is still broken. Further patches for that to follow tomorrow. Rich.

...lo \ Changes in the gnulib/ directory come from gnulib, so need to be sent/suggested to them: https://www.gnu.org/software/gnulib/ [...] > diff --git ruby/Makefile.am ruby/Makefile.am > index f605188..d28d77b 100644 > --- ruby/Makefile.am > +++ ruby/Makefile.am > @@ -21,6 +21,8 @@ generator_built = \ > ext/guestfs/_guestfs.c \ > bindtests.rb > > +DLEXT := $(shell $(RUBY) -rrbconfig -e "puts RbConfig::CONFIG['DLEXT']") > + > EXTRA_DIST = \ > $(generator_built) \ > Rakefile.in \ > @@ -38,7 +40,7 @@ CLEANFILES = \ > ext/guestfs/*~ \...

...| 14 ++++++++++++++ 6 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 docs/libnbd-security.pod create mode 100644 SECURITY diff --git a/docs/Makefile.am b/docs/Makefile.am index df58586..4c99b5d 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -38,6 +38,7 @@ generator_built = \ EXTRA_DIST = \ $(generator_built) \ libnbd.pod \ + libnbd-security.pod \ nbd_create.pod \ nbd_close.3 \ nbd_get_error.3 \ @@ -48,6 +49,7 @@ if HAVE_POD man_MANS = \ libnbd.3 \ + libnbd-security.1 \ nbd_create.3 \ nbd_close.3 \ nbd_get_error.3 \ @@ -73,4 +75,9 @@ libnbd.3: l...

...etails. >+# >+# You should have received a copy of the GNU General Public License >+# along with this program; if not, write to the Free Software >+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. >+ >+include $(top_srcdir)/subdir-rules.mk >+ >+generator_built = \ >+ src/lib.rs >+ >+EXTRA_DIST = \ >+ $(generator_built) >+ >+if HAVE_RUST >+ >+endif Maybe something is missing here? Martin

...ule could be implemented like the various submodules in Unix_utils. > diff --git a/daemon/Makefile.am b/daemon/Makefile.am > index eedf09d52..40b770762 100644 > --- a/daemon/Makefile.am > +++ b/daemon/Makefile.am > @@ -19,6 +19,7 @@ include $(top_srcdir)/subdir-rules.mk > > generator_built = \ > actions.h \ > + caml-stubs.c \ > dispatch.c \ > names.c \ > lvm-tokenization.c \ > @@ -31,13 +32,30 @@ generator_built = \ > stubs-4.c \ > stubs-5.c \ > stubs-6.c \ > - stubs.h > + stubs.h \ > + callbacks.ml \ > + types.ml > > BUIL...

...on/Makefile.am | 3 ++- rust/Makefile.am | 1 - tests/daemon/Makefile.am | 1 - 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/daemon/Makefile.am b/daemon/Makefile.am index 7c71920c4..20440aaee 100644 --- a/daemon/Makefile.am +++ b/daemon/Makefile.am @@ -59,9 +59,13 @@ generator_built = \ structs.ml \ structs.mli +CONFIGURE_GENERATED_ML = \ + daemon_config.ml + EXTRA_DIST = \ $(generator_built) \ - $(SOURCES_MLI) $(SOURCES_ML) \ + $(SOURCES_MLI) \ + $(filter-out $(CONFIGURE_GENERATED_ML),$(SOURCES_ML)) \ daemon_utils_tests.ml \ guestfsd.pod @@ -297,7 +301,7 @@ SOU...

...enerator, while src/guestfs.rs is. --- rust/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust/Makefile.am b/rust/Makefile.am index edcccffa1..cb16e021f 100644 --- a/rust/Makefile.am +++ b/rust/Makefile.am @@ -19,7 +19,7 @@ include $(top_srcdir)/subdir-rules.mk generator_built = \ src/bin/bindtests.rs \ - src/lib.rs + src/guestfs.rs EXTRA_DIST = \ $(generator_built) \ -- 2.23.0

...nsertions(+), 6 deletions(-) diff --git a/java/Makefile.am b/java/Makefile.am index c753672..9c31e57 100644 --- a/java/Makefile.am +++ b/java/Makefile.am @@ -22,12 +22,6 @@ java_prefix = com/redhat/et/libguestfs # Old RHEL 5 autoconf doesn't have builddir. builddir ?= $(top_builddir)/java -generator_built = \ - Makefile.inc \ - $(java_built_sources) \ - com_redhat_et_libguestfs_GuestFS.c \ - Bindtests.java - # Pull in automatically generated built sources include $(srcdir)/Makefile.inc -- 1.7.7.6

For these simple compile tests where we want to ensure that a basic external program could be compiled using libnbd, we shouldn't include <config.h>. This is because we want to test here that <libnbd.h> can stand alone, without needing anything defined by the GNU autotools infrastructure. Of course we can use <config.h> in other test programs where we aren't evaluating

version 2: - Fixed handling of clean & distclean. - Use 'all-local' instead of 'all'. - Don't use abs_* paths in Build.PL.in. Rich.

...| 14 ++++++++++++++ 6 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 docs/libnbd-security.pod create mode 100644 SECURITY diff --git a/docs/Makefile.am b/docs/Makefile.am index df58586..4c99b5d 100644 --- a/docs/Makefile.am +++ b/docs/Makefile.am @@ -38,6 +38,7 @@ generator_built = \ EXTRA_DIST = \ $(generator_built) \ libnbd.pod \ + libnbd-security.pod \ nbd_create.pod \ nbd_close.3 \ nbd_get_error.3 \ @@ -48,6 +49,7 @@ if HAVE_POD man_MANS = \ libnbd.3 \ + libnbd-security.1 \ nbd_create.3 \ nbd_close.3 \ nbd_get_error.3 \ @@ -73,4 +75,9 @@ libnbd.3: l...