From: Michal Privoznik Date: Sun, 14 Jan 2018 10:51:44 +0000 (+0100) Subject: tools: Always compile {virsh,virt-admin}-completer.c X-Git-Tag: v4.0.0-rc2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d6d5de53e9f2753d3eac0e8069cb7f7e089c2c9;p=thirdparty%2Flibvirt.git tools: Always compile {virsh,virt-admin}-completer.c The functions defined in these sources are referenced all over the place, however, compiler only when building with readline. Thus when building without it linker gets sad as it can't find them. Signed-off-by: Michal Privoznik Reviewed-by: Erik Skultety --- diff --git a/tools/Makefile.am b/tools/Makefile.am index 48125f5163..e9597cdb47 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -216,6 +216,7 @@ virt_login_shell_CFLAGS = \ virsh_SOURCES = \ virsh.c virsh.h \ + virsh-completer.c virsh-completer.h \ virsh-console.c virsh-console.h \ virsh-domain.c virsh-domain.h \ virsh-domain-monitor.c virsh-domain-monitor.h \ @@ -231,15 +232,6 @@ virsh_SOURCES = \ virsh-volume.c virsh-volume.h \ $(NULL) -VIRSH_COMPLETER = \ - virsh-completer.c virsh-completer.h - -if WITH_READLINE -virsh_SOURCES += $(VIRSH_COMPLETER) -else ! WITH_READLINE -EXTRA_DIST += $(VIRSH_COMPLETER) -endif ! WITH_READLINE - virsh_LDFLAGS = \ $(AM_LDFLAGS) \ $(PIE_LDFLAGS) \ @@ -256,17 +248,9 @@ virsh_CFLAGS = \ virt_admin_SOURCES = \ virt-admin.c virt-admin.h \ + virt-admin-completer.c virt-admin-completer.h \ $(NULL) -VIRT_ADMIN_COMPLETER = \ - virt-admin-completer.c virt-admin-completer.h - -if WITH_READLINE -virt_admin_SOURCES += $(VIRT_ADMIN_COMPLETER) -else ! WITH_READLINE -EXTRA_DIST += $(VIRT_ADMIN_COMPLETER) -endif ! WITH_READLINE - virt_admin_LDFLAGS = \ $(AM_LDFLAGS) \ $(COVERAGE_LDFLAGS) \