[Spice-commits] common/Makefile.am

[Christophe Fergau]

 common/Makefile.am |   12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 60046b309d5fca88e0e4113132257c775e571619
Author: Christophe Fergeau <cfergeau at redhat.com>
Date:   Tue Apr 22 15:38:50 2014 +0200

    Mark sw_canvas.[ch] as automake source files
    
    These 2 files are not build as part of spice-common
    build system, but modules using spice-common will build
    them with the appropriate options. We need to let automake
    know that these are source files so that it can properly
    track these files dependencies.
    
    Without this change, when eg spice-gtk switches to use 'subdir-objects'
    to build sw_canvas.c as recommended by automake 1.14, the build
    will fail because $(top_srcdir)/spice-common/common/.deps/sw_canvas.Plo
    will not have been generated.

diff --git a/common/Makefile.am b/common/Makefile.am
index 435d448..7b3aae9 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -60,6 +60,16 @@ libspice_common_la_SOURCES =		\
 	verify.h			\
 	$(NULL)
 
+# These 2 files are not build as part of spice-common
+# build system, but modules using spice-common will build
+# them with the appropriate options. We need to let automake
+# know that these are source files so that it can properly
+# track these files dependencies
+EXTRA_libspice_common_la_SOURCES = 	\
+	sw_canvas.c			\
+	sw_canvas.h			\
+	$(NULL)
+
 libspice_common_client_la_SOURCES =		\
 	$(CLIENT_MARSHALLERS)			\
 	$(NULL)
@@ -152,8 +162,6 @@ EXTRA_DIST =				\
 	quic_rgb_tmpl.c			\
 	quic_tmpl.c			\
 	snd_codec.h			\
-	sw_canvas.c			\
-	sw_canvas.h			\
 	$(NULL)
 
 -include $(top_srcdir)/git.mk