From ee4bec5920814729c068fb153a43bde05ecd9a62 Mon Sep 17 00:00:00 2001 From: Marcel Holtmann Date: Fri, 2 Apr 2021 07:26:29 +0200 Subject: [PATCH] build: Always link in the ell/useful.h header file Signed-off-by: Anuj Jain Signed-off-by: Ayush Garg --- Makefile.am | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 35822ab..206ce87 100755 --- a/Makefile.am +++ b/Makefile.am @@ -101,12 +101,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 @@ -138,7 +138,6 @@ ell_headers = ell/util.h \ ell/pem-private.h \ ell/uuid.h \ ell/uuid.h \ - ell/useful.h \ ell/main-private.h ell_sources = ell/private.h ell/missing.h \ @@ -177,7 +176,9 @@ ell_sources = ell/private.h ell/missing.h \ ell/siphash.c \ ell/uuid.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 CLEANFILES += $(ell_built_sources) @@ -629,6 +630,13 @@ lib/bluetooth/%.h: lib/%.h $(AM_V_at)$(MKDIR_P) lib/bluetooth $(AM_V_GEN)$(LN_S) -f $(abspath $<) $@ +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 \ -- 2.7.4