vsh: create a noinstall libvirt_shell library

Instead of referencing vsh sources in all relevant client targets,
create a library that the client can link against.
This commit is contained in:
Erik Skultety 2015-09-23 15:17:35 +02:00
parent a73c67b6cc
commit 2d9fcb3102

View File

@ -129,6 +129,24 @@ virt-sanlock-cleanup.8: virt-sanlock-cleanup.in $(top_srcdir)/configure.ac
&& if grep 'POD ERROR' $(srcdir)/$@ ; then \ && if grep 'POD ERROR' $(srcdir)/$@ ; then \
rm $(srcdir)/$@; exit 1; fi rm $(srcdir)/$@; exit 1; fi
noinst_LTLIBRARIES = libvirt_shell.la
libvirt_shell_la_CFLAGS = \
$(AM_CFLAGS) \
$(PIE_CFLAGS) \
$(READLINE_CFLAGS) \
$(LIBXML_CFLAGS) \
$(NULL)
libvirt_shell_la_LDFLAGS = \
$(AM_LDFLAGS) \
$(PIE_LDFLAGS) \
$(COVERAGE_LDFLAGS) \
$(NULL)
libvirt_shell_la_LIBADD = \
$(LIBXML_LIBS) \
../gnulib/lib/libgnu.la \
$(NULL)
libvirt_shell_la_SOURCES = vsh.c vsh.h
virt_host_validate_SOURCES = \ virt_host_validate_SOURCES = \
virt-host-validate.c \ virt-host-validate.c \
virt-host-validate-common.c virt-host-validate-common.h \ virt-host-validate-common.c virt-host-validate-common.h \
@ -179,11 +197,7 @@ virt_login_shell_CFLAGS = \
$(PIE_CFLAGS) \ $(PIE_CFLAGS) \
$(COVERAGE_CFLAGS) $(COVERAGE_CFLAGS)
virt_shell_SOURCES = \
vsh.c vsh.h
virsh_SOURCES = \ virsh_SOURCES = \
$(virt_shell_SOURCES) \
virsh.c virsh.h \ virsh.c virsh.h \
virsh-console.c virsh-console.h \ virsh-console.c virsh-console.h \
virsh-domain.c virsh-domain.h \ virsh-domain.c virsh-domain.h \
@ -209,15 +223,13 @@ virsh_LDADD = \
../src/libvirt.la \ ../src/libvirt.la \
../src/libvirt-lxc.la \ ../src/libvirt-lxc.la \
../src/libvirt-qemu.la \ ../src/libvirt-qemu.la \
../gnulib/lib/libgnu.la \ libvirt_shell.la \
$(LIBXML_LIBS) \
$(VIRSH_LIBS) $(VIRSH_LIBS)
virsh_CFLAGS = \ virsh_CFLAGS = \
$(WARN_CFLAGS) \ $(WARN_CFLAGS) \
$(PIE_CFLAGS) \ $(PIE_CFLAGS) \
$(COVERAGE_CFLAGS) \ $(COVERAGE_CFLAGS) \
$(LIBXML_CFLAGS) \ $(LIBXML_CFLAGS)
$(READLINE_CFLAGS)
BUILT_SOURCES = BUILT_SOURCES =
if WITH_WIN_ICON if WITH_WIN_ICON