From 38cd152952968e37d0cc96e95e3e5e47a2f66c2f Mon Sep 17 00:00:00 2001 From: Frediano Ziglio Date: Sun, 1 Mar 2020 19:38:38 +0000 Subject: [PATCH] automake: Link with C++ linker If automake sees no C++ files in the source it assumes have to use C linker settings not linking C++ library. This was not a problem as code did not use C++ libraries but next patch will use pure virtual function call. It could be provided but as later we will use RTTI use C++ library. Signed-off-by: Frediano Ziglio --- server/Makefile.am | 3 +++ server/tests/Makefile.am | 2 ++ 2 files changed, 5 insertions(+) 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