diff options
| author | Thomas Haller <thaller@redhat.com> | 2019-05-15 13:40:21 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2019-05-20 13:13:21 +0200 |
| commit | eccb932abaf7b1385f1086e86343a8c474b3d4ce (patch) | |
| tree | f4fd5c7d291ca4ea55e3f11f2740b6f05f8452c5 | |
| parent | 54b34f036f2b543c430e586e306c2c4dd29179ca (diff) | |
| download | NetworkManager-th/build-link-static-libraries-later.tar.gz | |
build: don't statically link static libraries with other static libraries (6)th/build-link-static-libraries-later
| -rw-r--r-- | Makefile.am | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am index f95c6358df..0de6959d09 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4135,11 +4135,6 @@ clients_common_libnmc_la_CPPFLAGS = \ $(NULL) clients_common_libnmc_la_LIBADD = \ - clients/common/libnmc-base.la \ - shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ - shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ - shared/nm-glib-aux/libnm-glib-aux.la \ - shared/nm-std-aux/libnm-std-aux.la \ libnm/libnm.la \ $(GLIB_LIBS) \ $(NULL) @@ -4166,8 +4161,10 @@ clients_common_tests_test_clients_common_LDFLAGS = \ $(SANITIZER_EXEC_LDFLAGS) clients_common_tests_test_clients_common_LDADD = \ - clients/common/libnmc-base.la \ clients/common/libnmc.la \ + clients/common/libnmc-base.la \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ shared/nm-glib-aux/libnm-glib-aux.la \ shared/nm-std-aux/libnm-std-aux.la \ shared/libcsiphash.la \ @@ -4257,8 +4254,10 @@ clients_cli_nmcli_CPPFLAGS = \ $(NULL) clients_cli_nmcli_LDADD = \ - clients/common/libnmc-base.la \ clients/common/libnmc.la \ + clients/common/libnmc-base.la \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ shared/nm-glib-aux/libnm-glib-aux.la \ shared/nm-std-aux/libnm-std-aux.la \ shared/libcsiphash.la \ @@ -4462,8 +4461,10 @@ clients_tui_nmtui_LDFLAGS = \ clients_tui_nmtui_LDADD = \ clients/tui/newt/libnmt-newt.a \ - clients/common/libnmc-base.la \ clients/common/libnmc.la \ + clients/common/libnmc-base.la \ + shared/nm-libnm-core-aux/libnm-libnm-core-aux.la \ + shared/nm-libnm-core-intern/libnm-libnm-core-intern.la \ shared/nm-glib-aux/libnm-glib-aux.la \ shared/nm-std-aux/libnm-std-aux.la \ shared/libcsiphash.la \ |