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 2dd56f3a52d15ab8b7b6ce35d158bdf1fe6f8aa7..65d463859d2612a84f311504626b3c05c96ec951 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 6fb8507700434aa8b6d05b08fb73a2e984d7e7df..7eae1118566885d5591878cfe8659ab57e2f5304 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 1a8b7682df5bfdbe84eda16a110c76802531aa6e..dc89814944e0fd1d243be421d202d68ef1bd9dd1 100644 (file)
--- 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 =                                  \