3
0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-25 17:59:25 +01:00

build: Always link in the ell/useful.h header file

This commit is contained in:
Marcel Holtmann 2021-03-11 21:52:12 +01:00
parent c19fd0ee78
commit ed05585063

View File

@ -10,12 +10,12 @@ if EXTERNAL_ELL
ell_cflags = @ELL_CFLAGS@ ell_cflags = @ELL_CFLAGS@
ell_ldadd = @ELL_LIBS@ ell_ldadd = @ELL_LIBS@
ell_dependencies = ell_dependencies =
ell_built_sources = ell_built_sources = ell/shared
else else
ell_cflags = ell_cflags =
ell_ldadd = ell/libell-internal.la ell_ldadd = ell/libell-internal.la
ell_dependencies = $(ell_ldadd) 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 noinst_LTLIBRARIES = ell/libell-internal.la
@ -65,7 +65,6 @@ ell_headers = ell/util.h \
ell_sources = ell/private.h \ ell_sources = ell/private.h \
ell/missing.h \ ell/missing.h \
ell/useful.h \
ell/util.c \ ell/util.c \
ell/test.c \ ell/test.c \
ell/strv.c \ ell/strv.c \
@ -142,7 +141,9 @@ ell_sources = ell/private.h \
ell/dhcp6-transport.c \ ell/dhcp6-transport.c \
ell/acd.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 endif
bin_PROGRAMS = 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 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 ell/internal: Makefile
$(AM_V_at)$(MKDIR_P) ell $(AM_V_at)$(MKDIR_P) ell
$(AM_V_GEN)for f in $(ell_headers) $(ell_sources) ; do \ $(AM_V_GEN)for f in $(ell_headers) $(ell_sources) ; do \