From ed05585063f2e6d8f2fcd5f008b861062ac7a429 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Thu, 11 Mar 2021 21:52:12 +0100
Subject: [PATCH] build: Always link in the ell/useful.h header file

---
 Makefile.am | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9b30aa39..644f3556 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,12 +10,12 @@ if EXTERNAL_ELL
 ell_cflags = @ELL_CFLAGS@
 ell_ldadd = @ELL_LIBS@
 ell_dependencies =
-ell_built_sources =
+ell_built_sources = ell/shared
 else
 ell_cflags =
 ell_ldadd = ell/libell-internal.la
 ell_dependencies = $(ell_ldadd)
-ell_built_sources = ell/internal ell/ell.h
+ell_built_sources = ell/shared ell/internal ell/ell.h
 
 noinst_LTLIBRARIES = ell/libell-internal.la
 
@@ -65,7 +65,6 @@ ell_headers = ell/util.h \
 
 ell_sources = ell/private.h \
 			ell/missing.h \
-			ell/useful.h \
 			ell/util.c \
 			ell/test.c \
 			ell/strv.c \
@@ -142,7 +141,9 @@ ell_sources = ell/private.h \
 			ell/dhcp6-transport.c \
 			ell/acd.c
 
-ell_libell_internal_la_SOURCES = $(ell_headers) $(ell_sources)
+ell_shared = ell/useful.h
+
+ell_libell_internal_la_SOURCES = $(ell_headers) $(ell_sources) $(ell_shared)
 endif
 
 bin_PROGRAMS =
@@ -623,6 +624,13 @@ unit/tls-settings.8021x: unit/cert-ca.pem unit/cert-client.pem unit/cert-client-
 
 BUILT_SOURCES = $(ell_built_sources) src/builtin.h
 
+ell/shared: Makefile
+	$(AM_V_GEN)for f in $(ell_shared) ; do \
+		if [ ! -f $$f ] ; then \
+			$(LN_S) -t ell -f $(abs_srcdir)/../ell/$$f ; \
+		fi \
+	done > $@
+
 ell/internal: Makefile
 	$(AM_V_at)$(MKDIR_P) ell
 	$(AM_V_GEN)for f in $(ell_headers) $(ell_sources) ; do \