korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-15 08:14:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Marcel Holtmann 2021-04-02 07:26:29 +02:00
parent 3f4039f43b
commit fde1e8fbf4
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Makefile.am
View File

@ -100,12 +100,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
@ -136,7 +136,6 @@ ell_headers = ell/util.h \
ell/cert-private.h \ ell/cert-private.h \
ell/pem-private.h \ ell/pem-private.h \
ell/uuid.h \ ell/uuid.h \
ell/useful.h \
ell/main-private.h ell/main-private.h
ell_sources = ell/private.h ell/missing.h \ ell_sources = ell/private.h ell/missing.h \
@ -175,7 +174,9 @@ ell_sources = ell/private.h ell/missing.h \
ell/siphash.c \ ell/siphash.c \
ell/uuid.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 endif
CLEANFILES += $(ell_built_sources) CLEANFILES += $(ell_built_sources)
@ -618,6 +619,13 @@ lib/bluetooth/%.h: lib/%.h
$(AM_V_at)$(MKDIR_P) lib/bluetooth $(AM_V_at)$(MKDIR_P) lib/bluetooth
$(AM_V_GEN)$(LN_S) -f $(abspath $<) $@ $(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 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 \