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 <mprivozn@redhat.com>
Reviewed-by: Erik Skultety <eskultet@redhat.com>

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 48125f516365a94b7deb1fa19904d5e9e6a3b23c..e9597cdb478d4d4e1b02bb2d95b13461aa9d5b3b 100644 (file)
--- 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) \