search for: fishcommon_source_files

.../fish/Makefile.am +++ b/fish/Makefile.am @@ -71,8 +71,7 @@ EXTRA_DIST = \ # between guestfish, guestmount and some other virt tools. Keep a # convenient list here just so we know which ones are shared. These # files must not include other guestfish files. -SHARED_SOURCE_FILES = \ - config.c \ +FISHCOMMON_SOURCE_FILES = \ decrypt.c \ display-options.h \ display-options.c \ @@ -81,11 +80,35 @@ SHARED_SOURCE_FILES = \ keys.c \ options.h \ options.c \ - progress.h \ - progress.c \ uri.h \ uri.c +SHARED_SOURCE_FILES = \ + $(FISHCOMMON_SOURCE_FILES) \ + config.c \ + progress.h \ + progress.c + +# li...

Some of the C tools were building also config.c as part of the shared sources from guestfish, and thus bringing a dependency on libconfig. Since none of them actually read the libguestfs configuration at all, then exclude fish/config.c from their build, and stop linking to libconfig. --- align/Makefile.am | 3 --- df/Makefile.am | 3 --- edit/Makefile.am | 3 ---

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

...+ $(top_builddir)/common/utils/libutils.la \ $(top_builddir)/src/libguestfs.la \ $(LIBXML2_LIBS) \ $(LIBVIRT_LIBS) \ diff --git a/fish/Makefile.am b/fish/Makefile.am index 8165772..8460b6d 100644 --- a/fish/Makefile.am +++ b/fish/Makefile.am @@ -97,6 +97,7 @@ libfishcommon_la_SOURCES = \ $(FISHCOMMON_SOURCE_FILES) libfishcommon_la_CPPFLAGS = \ -DGUESTFS_WARN_DEPRECATED=1 \ + -I$(top_srcdir)/common/utils -I$(top_builddir)/common/utils \ -I$(top_srcdir)/src -I$(top_builddir)/src \ -I$(top_srcdir)/fish -I$(top_builddir)/fish \ -I$(srcdir)/../gnulib/lib -I../gnulib/lib @@ -104,8 +105,8 @@ libfishcommon...

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.