[Spice-devel] [PATCH 1/3] Revert "Mark sw_canvas.[ch] as automake source files"

[Christophe Fergeau]

I initially thought this was fixing an automake subdir-objects issue,
but this is actually not helping.

This reverts commit 60046b309d5fca88e0e4113132257c775e571619.
---
 common/Makefile.am | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/common/Makefile.am b/common/Makefile.am
index 7b3aae9..435d448 100644
--- a/common/Makefile.am
+++ b/common/Makefile.am
@@ -60,16 +60,6 @@ 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)
@@ -162,6 +152,8 @@ EXTRA_DIST =				\
 	quic_rgb_tmpl.c			\
 	quic_tmpl.c			\
 	snd_codec.h			\
+	sw_canvas.c			\
+	sw_canvas.h			\
 	$(NULL)
 
 -include $(top_srcdir)/git.mk
-- 
1.9.0