From: Mike Brady <mikebrady@eircom.net>
Date: Mon, 5 Mar 2018 18:57:17 +0000 (+0000)
Subject: Fix bug to allow both --with-dbus and --with-mpris at the same time.
X-Git-Tag: 3.2d29~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e260bcc3cf52e272003ef122c73696167589bd7;p=thirdparty%2Fshairport-sync.git

Fix bug to allow both --with-dbus and --with-mpris at the same time.
---

diff --git a/Makefile.am b/Makefile.am
index ceff2d73..0607f02b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -75,13 +75,17 @@ if USE_DNS_SD
 shairport_sync_SOURCES += mdns_dns_sd.c
 endif
 
+BUILT_SOURCES =
+noinst_HEADERS =
+CLEANFILES =
+
 if USE_DBUS
 shairport_sync_SOURCES += dbus-service.c dbus-interface.c
-BUILT_SOURCES = dbus-interface.h dbus-interface.c 
+BUILT_SOURCES += dbus-interface.h dbus-interface.c 
 # We don't want to install this header
-noinst_HEADERS = $(BUILT_SOURCES)
+noinst_HEADERS += $(BUILT_SOURCES)
 # Correctly clean the generated headers, but keep the xml description
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES += $(BUILT_SOURCES)
 
 # Rule to generate the binding headers
 # See https://stackoverflow.com/questions/2973445/gnu-makefile-rule-generating-a-few-targets-from-a-single-source-file
@@ -100,11 +104,11 @@ endif
 
 if USE_MPRIS
 shairport_sync_SOURCES += mpris-service.c mpris-interface.c mpris-player-interface.c
-BUILT_SOURCES = mpris-interface.h mpris-interface.c mpris-player-interface.h mpris-player-interface.c
+BUILT_SOURCES += mpris-interface.h mpris-interface.c mpris-player-interface.h mpris-player-interface.c
 # We don't want to install this header
-noinst_HEADERS = $(BUILT_SOURCES)
+noinst_HEADERS += $(BUILT_SOURCES)
 # Correctly clean the generated headers, but keep the xml description
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES += $(BUILT_SOURCES)
 
 # Rule to generate the binding headers
 # See https://stackoverflow.com/questions/2973445/gnu-makefile-rule-generating-a-few-targets-from-a-single-source-file