From ee02c6b5006401e6088c539dbe7c670844dc3bda Mon Sep 17 00:00:00 2001 From: Jim Klimov Date: Sat, 1 Mar 2025 02:03:42 +0100 Subject: [PATCH] drivers/Makefile.am: reword default NUTSW_DRIVERLIST_DUMMY_UPS to avoid automake rewrites and actually not-conflict building dummy-ups twice Signed-off-by: Jim Klimov --- drivers/Makefile.am | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/drivers/Makefile.am b/drivers/Makefile.am index d608158477..b8ec70a319 100644 --- a/drivers/Makefile.am +++ b/drivers/Makefile.am @@ -51,10 +51,14 @@ if HAVE_LIBREGEX AM_CFLAGS += $(LIBREGEX_CFLAGS) endif -# Allow top-level Makefile override NUTSW_DRIVERLIST_DUMMY_UPS="" to run +# Allow top-level Makefile override NUTSW_DRIVERLIST_DUMMY_UPS="dummy" to run # a build scenario without this driver (it is in a different dependency) -NUTSW_DRIVERLIST_DUMMY_UPS = dummy-ups -NUTSW_DRIVERLIST = $(NUTSW_DRIVERLIST_DUMMY_UPS) clone clone-outlet apcupsd-ups skel +# NOTE: Must be defaulted with EXEEXT to avoid rewrites by automake parser +# which defeat the purpose of it being optionally built via `make all/drivers` +# in top level. +NUTSW_DRIVERLIST_DUMMY_UPS = dummy-ups$(EXEEXT) +NUTSW_DRIVERLIST = $(NUTSW_DRIVERLIST_DUMMY_UPS) \ + clone clone-outlet apcupsd-ups skel SERIAL_DRIVERLIST = al175 bcmxcp belkin belkinunv bestfcom \ bestfortress bestuferrups bestups etapro everups \ gamatronic genericups isbmex liebert liebert-esp2 liebert-gxe masterguard metasys \