From 61d2baa430dba6eb282167c61d7df1034d5acca7 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Wed, 1 Apr 2015 15:52:52 +0100 Subject: [PATCH] configure: Make tools/PROGRAMS agnostic to tools presence In order to make tools indivdiually selectable for compiling, we don't want to override earlier tools - so use '+=' rather than a plain '=' when adding each tool to the set of PROGRAMS. Signed-off-by: Chris Wilson --- tools/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/Makefile.am b/tools/Makefile.am index 20f8a003..92df266b 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -26,10 +26,12 @@ AM_CFLAGS = \ drivermandir = $(DRIVER_MAN_DIR) policydir = $(datarootdir)/polkit-1/actions +bin_PROGRAMS = noinst_PROGRAMS = +libexec_PROGRAMS = if BUILD_TOOLS -bin_PROGRAMS = intel-virtual-output +bin_PROGRAMS += intel-virtual-output driverman_DATA = intel-virtual-output.$(DRIVER_MAN_SUFFIX) endif @@ -47,7 +49,7 @@ dri3info_LDADD = $(X11_DRI3_LIBS) $(DRI_LIBS) endif if BUILD_BACKLIGHT_HELPER -libexec_PROGRAMS = xf86-video-intel-backlight-helper +libexec_PROGRAMS += xf86-video-intel-backlight-helper nodist_policy_DATA = org.x.xf86-video-intel.backlight-helper.policy backlight_helper = $(libexecdir)/xf86-video-intel-backlight-helper