7:24 a.m.
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 ---
format/Makefile.am | 3 ---
inspector/Makefile.am | 5 +----
5 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/align/Makefile.am b/align/Makefile.am
index eb44263..13f8812 100644
--- a/align/Makefile.am
+++ b/align/Makefile.am
@@ -32,7 +32,6 @@ SHARED_SOURCE_FILES = \
../df/estimate-max-threads.h \
../df/parallel.c \
../df/parallel.h \
- ../fish/config.c \
../fish/decrypt.c \
../fish/display-options.h \
../fish/display-options.c \
@@ -59,12 +58,10 @@ virt_alignment_scan_CPPFLAGS = \
virt_alignment_scan_CFLAGS = \
-pthread \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(LIBCONFIG_CFLAGS) \
$(LIBXML2_CFLAGS) \
$(LIBVIRT_CFLAGS)
virt_alignment_scan_LDADD = \
- $(LIBCONFIG_LIBS) \
$(top_builddir)/src/libutils.la \
$(top_builddir)/src/libguestfs.la \
$(LIBXML2_LIBS) \
diff --git a/df/Makefile.am b/df/Makefile.am
index 6efc1dc..f4a8602 100644
--- a/df/Makefile.am
+++ b/df/Makefile.am
@@ -27,7 +27,6 @@ EXTRA_DIST = \
bin_PROGRAMS = virt-df
SHARED_SOURCE_FILES = \
- ../fish/config.c \
../fish/decrypt.c \
../fish/display-options.h \
../fish/display-options.c \
@@ -62,12 +61,10 @@ virt_df_CPPFLAGS = \
virt_df_CFLAGS = \
-pthread \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(LIBCONFIG_CFLAGS) \
$(LIBXML2_CFLAGS) \
$(LIBVIRT_CFLAGS)
virt_df_LDADD = \
- $(LIBCONFIG_LIBS) \
$(top_builddir)/src/libutils.la \
$(top_builddir)/src/libguestfs.la \
$(LIBXML2_LIBS) \
diff --git a/edit/Makefile.am b/edit/Makefile.am
index dc9fbb0..48ad52f 100644
--- a/edit/Makefile.am
+++ b/edit/Makefile.am
@@ -25,7 +25,6 @@ EXTRA_DIST = \
bin_PROGRAMS = virt-edit
SHARED_SOURCE_FILES = \
- ../fish/config.c \
../fish/decrypt.c \
../fish/display-options.h \
../fish/display-options.c \
@@ -54,11 +53,9 @@ virt_edit_CPPFLAGS = \
virt_edit_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(LIBCONFIG_CFLAGS) \
$(LIBXML2_CFLAGS)
virt_edit_LDADD = \
- $(LIBCONFIG_LIBS) \
$(top_builddir)/src/libutils.la \
$(top_builddir)/src/libguestfs.la \
$(LIBXML2_LIBS) \
diff --git a/format/Makefile.am b/format/Makefile.am
index 0e881a5..6c22beb 100644
--- a/format/Makefile.am
+++ b/format/Makefile.am
@@ -25,7 +25,6 @@ EXTRA_DIST = \
bin_PROGRAMS = virt-format
SHARED_SOURCE_FILES = \
- ../fish/config.c \
../fish/decrypt.c \
../fish/display-options.h \
../fish/display-options.c \
@@ -50,12 +49,10 @@ virt_format_CPPFLAGS = \
virt_format_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(LIBCONFIG_CFLAGS) \
$(LIBXML2_CFLAGS) \
$(LIBVIRT_CFLAGS)
virt_format_LDADD = \
- $(LIBCONFIG_LIBS) \
$(top_builddir)/src/libutils.la \
$(top_builddir)/src/libguestfs.la \
$(LIBXML2_LIBS) \
diff --git a/inspector/Makefile.am b/inspector/Makefile.am
index 760e810..a872f4b 100644
--- a/inspector/Makefile.am
+++ b/inspector/Makefile.am
@@ -53,7 +53,6 @@ dist_doc_DATA = \
bin_PROGRAMS = virt-inspector
SHARED_SOURCE_FILES = \
- ../fish/config.c \
../fish/decrypt.c \
../fish/display-options.h \
../fish/display-options.c \
@@ -79,11 +78,9 @@ virt_inspector_CPPFLAGS = \
virt_inspector_CFLAGS = \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \
- $(LIBXML2_CFLAGS) \
- $(LIBCONFIG_CFLAGS)
+ $(LIBXML2_CFLAGS)
virt_inspector_LDADD = \
- $(LIBCONFIG_LIBS) \
$(top_builddir)/src/libutils.la \
$(top_builddir)/src/libguestfs.la \
$(LIBXML2_LIBS) \
--
2.7.4