From: Liang Guo <guoliang@debian.org>
Date: Fri, 1 Jul 2016 11:32:58 +0000 (+0100)
Subject: explicitly-enable-subdir-objects
X-Git-Tag: archive/raspbian/0.33-3.3+deb9u1+rpi1~1^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=dbc747f78fffb806a0d590da762d528023fe9559;p=spice-gtk.git

explicitly-enable-subdir-objects

When subdir source is included but subdir-objects is not
enabled, automake will throw a warning which will be considered
error by debian build system

Gbp-Pq: Name explicitly-enable-subdir-objects.patch
---

diff --git a/Makefile.am b/Makefile.am
index 47cf840..f83a325 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,6 @@
 ACLOCAL_AMFLAGS = -I m4
 NULL =
+AUTOMAKE_OPTIONS = subdir-objects
 
 SUBDIRS = spice-common src man po doc data
 
diff --git a/spice-common/Makefile.am b/spice-common/Makefile.am
index 63d7956..16661f4 100644
--- a/spice-common/Makefile.am
+++ b/spice-common/Makefile.am
@@ -1,5 +1,6 @@
 NULL =
 ACLOCAL_AMFLAGS = -I m4
+AUTOMAKE_OPTIONS = subdir-objects
 
 SUBDIRS = python_modules common tests
 
diff --git a/spice-common/common/Makefile.am b/spice-common/common/Makefile.am
index 2dd56f3..65d4638 100644
--- a/spice-common/common/Makefile.am
+++ b/spice-common/common/Makefile.am
@@ -1,5 +1,7 @@
 NULL =
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 # Avoid need for python(pyparsing) by end users
 CLIENT_MARSHALLERS =				\
 	generated_client_demarshallers.c	\
diff --git a/src/Makefile.am b/src/Makefile.am
index 6fb8507..7eae111 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,6 @@
 NULL =
 SUBDIRS =
+AUTOMAKE_OPTIONS = subdir-objects
 
 if WITH_CONTROLLER
 SUBDIRS += controller
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 1a8b768..dc89814 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -16,6 +16,7 @@ TESTS += usb-acl-helper
 noinst_PROGRAMS += mock-acl-helper
 endif
 
+AUTOMAKE_OPTIONS = subdir-objects
 noinst_PROGRAMS += $(TESTS)
 
 AM_CPPFLAGS =					\