search for: libprotocol_la_sources

...diff --git a/src/Makefile.am b/src/Makefile.am index c6006d2..9eb71b9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -48,6 +48,14 @@ BUILT_SOURCES = \ guestfs-actions.c \ guestfs-bindtests.c +# This convenience library is solely to avoid compiler warnings +# in its generated sources. +libprotocol_la_SOURCES = \ + guestfs_protocol.c \ + guestfs_protocol.h + +libprotocol_la_CFLAGS = -Wall -Wno-unused + $(BUILT_SOURCES): stamp-generator CLEANFILES = guestfs_protocol.c guestfs_protocol.h @@ -98,13 +106,15 @@ libguestfs_la_LDFLAGS = -version-info $(MAX_PROC_NR):0:$(MAX_PROC_NR) libguestfs_la_SOURCES...

...S = libguestfs.la -BUILT_SOURCES = \ - guestfs_protocol.x \ - guestfs_protocol.c \ - guestfs_protocol.h \ - guestfs-structs.h \ - guestfs-actions.h \ - guestfs-actions.c \ - guestfs-bindtests.c - # This convenience library is solely to avoid compiler warnings # in its generated sources. libprotocol_la_SOURCES = \ @@ -57,8 +60,6 @@ libprotocol_la_SOURCES = \ libprotocol_la_CFLAGS = -CLEANFILES = guestfs_protocol.c guestfs_protocol.h - # From the libtool info file, with comments: # # | 1. Start with version information of `0:0:0' for each libtool library. -- 1.6.5.2

...files changed, 3 insertions(+), 2 deletions(-) diff --git a/common/protocol/Makefile.am b/common/protocol/Makefile.am index cfac2d8d375f..778758209d4c 100644 --- a/common/protocol/Makefile.am +++ b/common/protocol/Makefile.am @@ -34,7 +34,8 @@ noinst_LTLIBRARIES = libprotocol.la # warnings here. libprotocol_la_SOURCES = guestfs_protocol.c guestfs_protocol.h libprotocol_la_CFLAGS = \ - -Wall -Wno-unused -fno-strict-aliasing $(GCC_VISIBILITY_HIDDEN) + -Wall -Wno-unused -fno-strict-aliasing $(GCC_VISIBILITY_HIDDEN) \ + $(RPC_CFLAGS) if HAVE_RPCGEN diff --git a/fish/Makefile.am b/fish/Makefile.am index a6efb...

...= guestfs.h guestfs-actions.h guestfs-structs.h lib_LTLIBRARIES = libguestfs.la @@ -49,6 +47,8 @@ BUILT_SOURCES = \ guestfs-actions.c \ guestfs-bindtests.c +$(BUILT_SOURCES): stamp-generator + # This convenience library is solely to avoid compiler warnings # in its generated sources. libprotocol_la_SOURCES = \ -- 1.6.5.2

.../protocol/Makefile.am b/common/protocol/Makefile.am index 74c288a..b115c58 100644 --- a/common/protocol/Makefile.am +++ b/common/protocol/Makefile.am @@ -37,6 +37,8 @@ EXTRA_DIST = \ generate-protostrings.sh \ $(NULL) +include_HEADERS = nbd-protocol.h + noinst_LTLIBRARIES = libprotocol.la libprotocol_la_SOURCES = \ diff --git a/common/protocol/nbd-protocol.h b/common/protocol/nbd-protocol.h index 724ffb6..7df411a 100644 --- a/common/protocol/nbd-protocol.h +++ b/common/protocol/nbd-protocol.h @@ -36,10 +36,16 @@ #include <stdint.h> /* Note that all NBD fields are sent on the wire in network byte...

...es.mk + +generator_built = \ + guestfs_protocol.x + +BUILT_SOURCES = \ + $(generator_built) \ + guestfs_protocol.c \ + guestfs_protocol.h + +EXTRA_DIST = \ + $(BUILT_SOURCES) + +noinst_LTLIBRARIES = libprotocol.la + +# Because rpcgen generates archaic code, we cannot use ordinary +# warnings here. +libprotocol_la_SOURCES = guestfs_protocol.c guestfs_protocol.h +libprotocol_la_CFLAGS = \ + -Wall -Wno-unused -fno-strict-aliasing $(GCC_VISIBILITY_HIDDEN) + +if HAVE_RPCGEN +RPCGEN_DEFS = +if HAVE_XDR_U_INT64_T +RPCGEN_DEFS += -DHAVE_XDR_U_INT64_T=1 +else +if HAVE_XDR_UINT64_T +RPCGEN_DEFS += -DHAVE_XDR_UINT64_T=1 +end...

...96be26 100644 --- a/common/protocol/Makefile.am +++ b/common/protocol/Makefile.am @@ -32,7 +32,7 @@ include $(top_srcdir)/common-rules.mk EXTRA_DIST = \ - protocol.h \ + nbd-protocol.h \ protostrings.c \ protostrings.sed \ $(NULL) @@ -41,16 +41,16 @@ noinst_LTLIBRARIES = libprotocol.la libprotocol_la_SOURCES = \ protostrings.c \ - protocol.h \ + nbd-protocol.h \ $(NULL) libprotocol_la_CFLAGS = $(WARNINGS_CFLAGS) -# protostrings.c is generated from the protocol.h header file where it -# is used to map NBD protocol flags to strings. +# protostrings.c is generated from the nbd-protocol.h hea...

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.

We should have only one NBD protocol file. Let's make nbdkit's version the canonical one, and use it in libnbd. Rich.

...fs_libraries.m4 | 32 ++++++++++++++++++-------------- 7 files changed, 41 insertions(+), 57 deletions(-) diff --git a/common/protocol/Makefile.am b/common/protocol/Makefile.am index c426f26..eb935f6 100644 --- a/common/protocol/Makefile.am +++ b/common/protocol/Makefile.am @@ -36,25 +36,15 @@ libprotocol_la_SOURCES = guestfs_protocol.c guestfs_protocol.h libprotocol_la_CFLAGS = \ -Wall -Wno-unused -fno-strict-aliasing $(GCC_VISIBILITY_HIDDEN) -if HAVE_RPCGEN -RPCGEN_DEFS = -if HAVE_XDR_U_INT64_T -RPCGEN_DEFS += -DHAVE_XDR_U_INT64_T=1 -else -if HAVE_XDR_UINT64_T -RPCGEN_DEFS += -DHAVE_XDR_UINT64_T=1 -end...

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.

...6..74c288a 100644 --- a/common/protocol/Makefile.am +++ b/common/protocol/Makefile.am @@ -34,13 +34,14 @@ include $(top_srcdir)/common-rules.mk EXTRA_DIST = \ nbd-protocol.h \ protostrings.c \ - protostrings.sed \ + generate-protostrings.sh \ $(NULL) noinst_LTLIBRARIES = libprotocol.la libprotocol_la_SOURCES = \ protostrings.c \ + protostrings.h \ nbd-protocol.h \ $(NULL) libprotocol_la_CFLAGS = $(WARNINGS_CFLAGS) @@ -50,8 +51,9 @@ libprotocol_la_CFLAGS = $(WARNINGS_CFLAGS) BUILT_SOURCES = protostrings.c CLEANFILES += protostrings.c -protostrings.c: nbd-protocol.h protostrings.sed Mak...

From: "Richard W.M. Jones" <rjones at redhat.com> --- configure.ac | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/configure.ac b/configure.ac index fa97479..6e42423 100644 --- a/configure.ac +++ b/configure.ac @@ -141,6 +141,10 @@ if test "$gl_gcc_warnings" = yes; then # Work around warning in src/inspect.c. This seems to be a bug in gcc

These patches first make src/ warning free, and then turn on the strict warning options. 75 0001-build-suppress-an-ignored-write-return-value-warning.patch 38 0002-build-suppress-an-ignored-dup-return-value-warning.patch 27 0003-generator.ml-suppress-signed-unsigned-compare-warnin.patch 48 0004-build-don-t-perform-arithmetic-on-void-pointers.patch 30

This patch series moves some files and directories around but is only code motion (or supposed to be). A new directory, common/, is created for all of the common code which is currently shared in random ways between parts of the project. And src/ becomes lib/ (the largest change, but mostly mechanical). In full this series makes the following changes: src/libprotocol -> common/protocol

Previous patch series was posted here: https://www.redhat.com/archives/libguestfs/2017-January/msg00059.html v2 simply extends this patch series to cover the extra directories common/edit, common/progress, common/windows and common/parallel. The only remaining item is to consider whether we should rename mllib to something else, mlcommon was my suggestion. Rich.