From 91751c0b950eb08631288e3e9a44ded9d448072a Mon Sep 17 00:00:00 2001 From: Liang Guo Date: Fri, 26 Oct 2018 16:52:24 +0100 Subject: [PATCH] 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 --- Makefile.am | 1 + spice-common/Makefile.am | 1 + spice-common/common/Makefile.am | 2 ++ src/Makefile.am | 1 + tests/Makefile.am | 1 + 5 files changed, 6 insertions(+) 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 21bbe4e..f43c25c 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 78953dd..a5c6425 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 3a0188d..0f89b6c 100644 --- 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 = \ -- 2.30.2