diff --git a/server/Makefile.am b/server/Makefile.am
index 60fef968..00450c5f 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -214,6 +214,9 @@ endif
 
 libspice_server_la_LIBADD = libserver.la
 libspice_server_la_SOURCES =
+## see https://www.gnu.org/software/automake/manual/html_node/Libtool-Convenience-Libraries.html
+## ("Libtool Convenience Libraries")
+nodist_EXTRA_libspice_server_la_SOURCES = dummy.cpp
 
 spice-server-enums.c: spice-server.h spice-server-enums.c.tmpl
 	$(AM_V_GEN)glib-mkenums --template $(srcdir)/spice-server-enums.c.tmpl $< > $@
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index 2dd6f53a..a21d97b9 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -74,6 +74,8 @@ check_PROGRAMS =				\
 	test-record				\
 	$(NULL)
 
+LINK = $(CXXLINK)
+
 if HAVE_SMARTCARD
 check_PROGRAMS += test-smartcard
 test_smartcard_SOURCES = test-smartcard.cpp