From b16247539137964736c6274a80c603cc83c0faf3 Mon Sep 17 00:00:00 2001 From: Zdenek Kabelac Date: Fri, 13 Oct 2023 16:34:48 +0200 Subject: [PATCH] makefiles: fix missing libs Recent commit dc8837f07982663add6c1f4d87fb79fa9b6c8857 became actually to strict - we always want to build lib.a files. --- libdm/make.tmpl.in | 4 +--- make.tmpl.in | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/libdm/make.tmpl.in b/libdm/make.tmpl.in index 1b68ea26b..2dd9625d4 100644 --- a/libdm/make.tmpl.in +++ b/libdm/make.tmpl.in @@ -318,12 +318,10 @@ SUBDIRS.cflow := $(SUBDIRS:=.cflow) SUBDIRS.clean := $(SUBDIRS:=.clean) SUBDIRS.distclean := $(SUBDIRS:=.distclean) +TARGETS += $(LIB_STATIC) ifeq ("@SHARED_LINK@", "yes") TARGETS += $(LIB_SHARED) endif -ifeq ("@STATIC_LINK@", "yes") - TARGETS += $(LIB_STATIC) -endif all: $(SUBDIRS) $(TARGETS) diff --git a/make.tmpl.in b/make.tmpl.in index 459bc4624..28399bd69 100644 --- a/make.tmpl.in +++ b/make.tmpl.in @@ -373,12 +373,10 @@ SUBDIRS.cflow := $(SUBDIRS:=.cflow) SUBDIRS.clean := $(SUBDIRS:=.clean) SUBDIRS.distclean := $(SUBDIRS:=.distclean) +TARGETS += $(LIB_STATIC) ifeq ("@SHARED_LINK@", "yes") TARGETS += $(LIB_SHARED) endif -ifeq ("@STATIC_LINK@", "yes") - TARGETS += $(LIB_STATIC) -endif INTERNAL_LIBS = \ $(top_builddir)/libdaemon/client/libdaemonclient.a \