mirror of git://git.sysmocom.de/ofono
build: Don't overwrite src_ofonod_DEPENDENCIES
src_ofonod_DEPENDENCIES did overwrite the dependencies automatically generated from src_ofonod_LDADD with incomplete dependencies. This fixes the following build error: ... CCLD src/ofonod libtool: error: cannot find the library 'gdbus/libgdbus-internal.la' or unhandled argument 'gdbus/libgdbus-internal.la' make: *** [Makefile:3448: src/ofonod] Error 1
This commit is contained in:
parent
48e31f9fc3
commit
8bde9f095a
|
@ -6,12 +6,10 @@ noinst_LTLIBRARIES =
|
||||||
if EXTERNAL_ELL
|
if EXTERNAL_ELL
|
||||||
ell_cflags = @ELL_CFLAGS@
|
ell_cflags = @ELL_CFLAGS@
|
||||||
ell_ldadd = @ELL_LIBS@
|
ell_ldadd = @ELL_LIBS@
|
||||||
ell_dependencies =
|
|
||||||
ell_built_sources =
|
ell_built_sources =
|
||||||
else
|
else
|
||||||
ell_cflags =
|
ell_cflags =
|
||||||
ell_ldadd = ell/libell-internal.la
|
ell_ldadd = ell/libell-internal.la
|
||||||
ell_dependencies = $(ell_ldadd)
|
|
||||||
ell_built_sources = ell/internal ell/ell.h
|
ell_built_sources = ell/internal ell/ell.h
|
||||||
|
|
||||||
noinst_LTLIBRARIES += ell/libell-internal.la
|
noinst_LTLIBRARIES += ell/libell-internal.la
|
||||||
|
@ -729,8 +727,6 @@ src_ofonod_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) $(ell_ldadd) \
|
||||||
src_ofonod_LDFLAGS = -Wl,--export-dynamic \
|
src_ofonod_LDFLAGS = -Wl,--export-dynamic \
|
||||||
-Wl,--version-script=$(srcdir)/src/ofono.ver
|
-Wl,--version-script=$(srcdir)/src/ofono.ver
|
||||||
|
|
||||||
src_ofonod_DEPENDENCIES = $(ell_dependencies)
|
|
||||||
|
|
||||||
BUILT_SOURCES = $(local_headers) $(ell_built_sources) src/builtin.h
|
BUILT_SOURCES = $(local_headers) $(ell_built_sources) src/builtin.h
|
||||||
|
|
||||||
CLEANFILES = $(BUILT_SOURCES) $(rules_DATA)
|
CLEANFILES = $(BUILT_SOURCES) $(rules_DATA)
|
||||||
|
|
Loading…
Reference in New Issue