[Spice-commits] 2 commits - server/Makefile.am server/tests

[Christophe Fergau]

 server/Makefile.am       |    3 ++-
 server/tests/Makefile.am |    2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 1170282cec1b4d4ba251b6f801be2c4375231d41
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Thu Dec 7 18:01:58 2017 +0100

    build: Use $(srcdir) when it makes sense
    
    There are a few places which use $(top_srcdir) when $(srcdir) would be
    equally valid.
    
    Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/Makefile.am b/server/Makefile.am
index 74d3a824..38c346c2 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -35,8 +35,8 @@ libspice_server_la_LDFLAGS =			\
 
 if HAVE_LD_VERSION_SCRIPT
 libspice_server_la_LDFLAGS += \
-	-Wl,--version-script=$(top_srcdir)/server/spice-server.syms
-EXTRA_libspice_server_la_DEPENDENCIES = $(top_srcdir)/server/spice-server.syms
+	-Wl,--version-script=$(srcdir)/spice-server.syms
+EXTRA_libspice_server_la_DEPENDENCIES = $(srcdir)/spice-server.syms
 endif
 
 libserver_la_LIBADD =							\
diff --git a/server/tests/Makefile.am b/server/tests/Makefile.am
index 971575b5..ad55eb76 100644
--- a/server/tests/Makefile.am
+++ b/server/tests/Makefile.am
@@ -1,7 +1,7 @@
 NULL =
 
 @VALGRIND_CHECK_RULES@
-VALGRIND_SUPPRESSIONS_FILES = $(top_srcdir)/server/tests/valgrind/glib.supp
+VALGRIND_SUPPRESSIONS_FILES = $(srcdir)/valgrind/glib.supp
 EXTRA_DIST =				\
 	$(VALGRIND_SUPPRESSIONS_FILES)	\
 	pki/ca-cert.pem			\
commit c9b9a5fd353a2bdcdcb84b9bf69b066a56ce478a
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Thu Dec 7 17:06:45 2017 +0100

    build: Rebuild shared library when symbol file changes
    
    At the moment, changing spice-server.syms to add/remove a new symbol to
    be exported does not regenerate spice-server.so. This commit added the
    needed dependency for this to work.
    
    Signed-off-by: Christophe Fergeau <cfergeau at redhat.com>
    Acked-by: Frediano Ziglio <fziglio at redhat.com>

diff --git a/server/Makefile.am b/server/Makefile.am
index 8ea258db..74d3a824 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -36,6 +36,7 @@ libspice_server_la_LDFLAGS =			\
 if HAVE_LD_VERSION_SCRIPT
 libspice_server_la_LDFLAGS += \
 	-Wl,--version-script=$(top_srcdir)/server/spice-server.syms
+EXTRA_libspice_server_la_DEPENDENCIES = $(top_srcdir)/server/spice-server.syms
 endif
 
 libserver_la_LIBADD =							\