Brad Bishop | 15ae250 | 2019-06-18 21:44:24 -0400 | [diff] [blame^] | 1 | From eeaf8dac80f15a2b7c18d1d4ee63106973a6a873 Mon Sep 17 00:00:00 2001 |
| 2 | From: Adrian Bunk <bunk@kernel.org> |
| 3 | Date: Tue, 21 May 2019 14:13:35 +0300 |
| 4 | Subject: Makefile.am: Don't overwrite src_ofonod_DEPENDENCIES |
| 5 | |
| 6 | src_ofonod_DEPENDENCIES did overwrite the dependencies |
| 7 | automatically generated from src_ofonod_LDADD with |
| 8 | incomplete dependencies. |
| 9 | |
| 10 | This fixes the following build error: |
| 11 | ... |
| 12 | CCLD src/ofonod |
| 13 | libtool: error: cannot find the library 'gdbus/libgdbus-internal.la' or unhandled argument 'gdbus/libgdbus-internal.la' |
| 14 | make: *** [Makefile:3448: src/ofonod] Error 1 |
| 15 | |
| 16 | Upstream-Status: Submitted |
| 17 | Signed-off-by: Adrian Bunk <bunk@stusta.de> |
| 18 | --- |
| 19 | Makefile.am | 4 ---- |
| 20 | 1 file changed, 4 deletions(-) |
| 21 | |
| 22 | diff --git a/Makefile.am b/Makefile.am |
| 23 | index d2e310d5..5edc4488 100644 |
| 24 | --- a/Makefile.am |
| 25 | +++ b/Makefile.am |
| 26 | @@ -6,12 +6,10 @@ noinst_LTLIBRARIES = |
| 27 | if EXTERNAL_ELL |
| 28 | ell_cflags = @ELL_CFLAGS@ |
| 29 | ell_ldadd = @ELL_LIBS@ |
| 30 | -ell_dependencies = |
| 31 | ell_built_sources = |
| 32 | else |
| 33 | ell_cflags = |
| 34 | ell_ldadd = ell/libell-internal.la |
| 35 | -ell_dependencies = $(ell_ldadd) |
| 36 | ell_built_sources = ell/internal ell/ell.h |
| 37 | |
| 38 | noinst_LTLIBRARIES += ell/libell-internal.la |
| 39 | @@ -729,8 +727,6 @@ src_ofonod_LDADD = gdbus/libgdbus-internal.la $(builtin_libadd) $(ell_ldadd) \ |
| 40 | src_ofonod_LDFLAGS = -Wl,--export-dynamic \ |
| 41 | -Wl,--version-script=$(srcdir)/src/ofono.ver |
| 42 | |
| 43 | -src_ofonod_DEPENDENCIES = $(ell_dependencies) |
| 44 | - |
| 45 | BUILT_SOURCES = $(local_headers) $(ell_built_sources) src/builtin.h |
| 46 | |
| 47 | CLEANFILES = $(BUILT_SOURCES) $(rules_DATA) |
| 48 | -- |
| 49 | 2.20.1 |
| 50 | |