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 47cf8403f332c4c73819100cea1201463024679e..f83a325349168442958deb6c52859e6ae1496b50 100644 (file)
--- 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 63d7956292c1e6277896bceb6a030cd42e1d61af..16661f43faec0c081cb4bda87b882c0d96af7c42 100644 (file)
--- 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 21bbe4e0f4bb82f88c230a6991eabb95136c9187..f43c25cfeffce1bd109522e23dc2a5981ef2a626 100644 (file)
--- 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 78953ddb7e901cf1e5f30e771a8cf0596413ae06..a5c6425003e3455e541aa1de851bf0dd12559191 100644 (file)
--- 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 3a0188d7b891eddebf55f8a68bc68fadc92b8987..0f89b6c713e5eb9619f6442bcd50c90f5cefa39f 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -17,6 +17,7 @@ TESTS += test-usb-acl-helper
 noinst_PROGRAMS += test-mock-acl-helper
 endif
 
+AUTOMAKE_OPTIONS = subdir-objects
 noinst_PROGRAMS += $(TESTS)
 
 AM_CPPFLAGS =                                  \