OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire file – Ignore whitespace
Rev 2 Rev 3
Line 24... Line 24...
24 Upstream status: https://github.com/thom311/libnl/pull/141 24 Upstream status: https://github.com/thom311/libnl/pull/141
Line 25... Line 25...
25   25  
26 Makefile.am | 21 ++++++--------------- 26 Makefile.am | 21 ++++++---------------
Line -... Line 27...
-   27 1 file changed, 6 insertions(+), 15 deletions(-)
-   28  
27 1 file changed, 6 insertions(+), 15 deletions(-) 29 diff --git a/Makefile.am b/Makefile.am
28   30 index 1b95a559304f..279548394650 100644
29 --- a/Makefile.am 31 --- a/Makefile.am
30 +++ b/Makefile.am 32 +++ b/Makefile.am
Line 35... Line 37...
35 -noinst_LTLIBRARIES = 37 -noinst_LTLIBRARIES =
36 -check_LTLIBRARIES = 38 -check_LTLIBRARIES =
Line 37... Line 39...
37 39
38 check_PROGRAMS = 40 check_PROGRAMS =
39 check_programs = 41 check_programs =
40 @@ -511,6 +509,8 @@ EXTRA_lib_libnl_xfrm_3_la_DEPENDENCIES = 42 @@ -500,6 +498,8 @@ EXTRA_lib_libnl_xfrm_3_la_DEPENDENCIES = \
41 lib_libnl_xfrm_3_la_LIBADD = \ 43 lib_libnl_xfrm_3_la_LIBADD = \
Line 42... Line 44...
42 lib/libnl-3.la 44 lib/libnl-3.la
43 45
44 +if ENABLE_CLI 46 +if ENABLE_CLI
45 + 47 +
46 lib_cli_ltlibraries_cls = \ 48 lib_cli_ltlibraries_cls = \
47 lib/cli/cls/basic.la \ 49 lib/cli/cls/basic.la \
48 lib/cli/cls/cgroup.la 50 lib/cli/cls/cgroup.la
49 @@ -524,15 +524,11 @@ lib_cli_ltlibraries_qdisc = \ 51 @@ -513,15 +513,11 @@ lib_cli_ltlibraries_qdisc = \
Line 50... Line 52...
50 lib/cli/qdisc/pfifo.la \ 52 lib/cli/qdisc/pfifo.la \
51 lib/cli/qdisc/plug.la 53 lib/cli/qdisc/plug.la
52 54
53 -if ENABLE_CLI 55 -if ENABLE_CLI
54 pkglib_clsdir = $(pkglibdir)/cli/cls 56 pkglib_clsdir = $(pkglibdir)/cli/cls
55 pkglib_qdiscdir = $(pkglibdir)/cli/qdisc 57 pkglib_qdiscdir = $(pkglibdir)/cli/qdisc
56 pkglib_cls_LTLIBRARIES = $(lib_cli_ltlibraries_cls) 58 pkglib_cls_LTLIBRARIES = $(lib_cli_ltlibraries_cls)
57 pkglib_qdisc_LTLIBRARIES = $(lib_cli_ltlibraries_qdisc) 59 pkglib_qdisc_LTLIBRARIES = $(lib_cli_ltlibraries_qdisc)
58 -else 60 -else
59 -check_LTLIBRARIES += \ 61 -noinst_LTLIBRARIES += \
60 - $(lib_cli_ltlibraries_cls) \ 62 - $(lib_cli_ltlibraries_cls) \
Line 61... Line 63...
61 - $(lib_cli_ltlibraries_qdisc) 63 - $(lib_cli_ltlibraries_qdisc)
62 + 64 +
Line -... Line 65...
-   65 endif
-   66
-   67 lib_cli_ldflags = \
-   68 @@ -550,13 +546,8 @@ lib_cli_qdisc_plug_la_LDFLAGS = $(lib_cli_ldflags)
63 endif 69
64 70 ###############################################################################
65 lib_cli_ldflags = \ 71
66 @@ -565,9 +561,6 @@ src_lib_ldflags = 72 -src_lib_ldflags =
67 73 -
68 if ENABLE_CLI 74 if ENABLE_CLI
Line 69... Line 75...
69 lib_LTLIBRARIES += src/lib/libnl-cli-3.la 75 lib_LTLIBRARIES += src/lib/libnl-cli-3.la
70 -src_lib_ldflags += -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 76 -src_lib_ldflags += -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
71 -else 77 -else
72 -check_LTLIBRARIES += src/lib/libnl-cli-3.la 78 -check_LTLIBRARIES += src/lib/libnl-cli-3.la
73 endif 79 endif
74 80
75 src_lib_libnl_cli_3_la_SOURCES = \ 81 src_lib_libnl_cli_3_la_SOURCES = \
76 @@ -594,7 +587,7 @@ src_lib_libnl_cli_3_la_CPPFLAGS = \ 82 @@ -583,7 +574,7 @@ src_lib_libnl_cli_3_la_CPPFLAGS = \
77 -I$(srcdir)/include \ 83 -I$(srcdir)/include \
78 -I$(builddir)/include 84 -I$(builddir)/include
79 src_lib_libnl_cli_3_la_LDFLAGS = \ 85 src_lib_libnl_cli_3_la_LDFLAGS = \
80 - $(src_lib_ldflags) \ 86 - $(src_lib_ldflags) \
81 + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \ 87 + -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
82 -Wl,--version-script=$(srcdir)/libnl-cli-3.sym 88 -Wl,--version-script=$(srcdir)/libnl-cli-3.sym
83 src_lib_libnl_cli_3_la_LIBADD = \ 89 src_lib_libnl_cli_3_la_LIBADD = \
84 lib/libnl-3.la \ 90 lib/libnl-3.la \
85 @@ -679,8 +672,6 @@ else 91 @@ -668,8 +659,6 @@ else
Line 86... Line 92...
86 noinst_PROGRAMS += $(cli_programs) 92 noinst_PROGRAMS += $(cli_programs)
87 endif 93 endif
88 endif 94 endif
89 -else 95 -else
Line 90... Line 96...
90 -check_PROGRAMS += $(cli_programs) 96 -check_PROGRAMS += $(cli_programs)
91 endif 97 endif
Line 102... Line 108...
102 tests/test-nf-cache-mngr 108 tests/test-nf-cache-mngr
103 +endif 109 +endif
Line 104... Line 110...
104 110
105 tests_cli_ldadd = \ 111 tests_cli_ldadd = \
-   112 $(tests_ldadd) \
-   113 --
-   114 2.11.0