system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-07-24 03:34:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

build: drop trivial variables from Makefile.am

Browse source 
It just hides what we link. Link against GLIB explicitly
instead of indirectly via another variable.
This commit is contained in:
Thomas Haller 2019-05-15 12:51:04 +02:00
parent c808191846
commit 53168b0d2c
1 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Makefile.am
View file

@ -991,7 +991,7 @@ libnm_core_libnm_crypto_gnutls_la_CPPFLAGS = \
libnm_core_libnm_crypto_gnutls_la_LDFLAGS = \ libnm_core_libnm_crypto_gnutls_la_LDFLAGS = \
$(libnm_core_libnm_core_la_LDFLAGS) $(libnm_core_libnm_core_la_LDFLAGS)
libnm_core_libnm_crypto_gnutls_la_LIBADD = \ libnm_core_libnm_crypto_gnutls_la_LIBADD = \
$(libnm_core_libnm_core_la_LIBADD) \ $(GLIB_LIBS) \
$(GNUTLS_LIBS) $(GNUTLS_LIBS)
endif endif
@ -1009,7 +1009,7 @@ libnm_core_libnm_crypto_nss_la_CPPFLAGS = \
libnm_core_libnm_crypto_nss_la_LDFLAGS = \ libnm_core_libnm_crypto_nss_la_LDFLAGS = \
$(libnm_core_libnm_core_la_LDFLAGS) $(libnm_core_libnm_core_la_LDFLAGS)
libnm_core_libnm_crypto_nss_la_LIBADD = \ libnm_core_libnm_crypto_nss_la_LIBADD = \
$(libnm_core_libnm_core_la_LIBADD) \ $(GLIB_LIBS) \
$(NSS_LIBS) $(NSS_LIBS)
endif endif
@ -1631,11 +1631,6 @@ libsystemd_cppflags = \
$(CODE_COVERAGE_CFLAGS) \ $(CODE_COVERAGE_CFLAGS) \
$(NULL) $(NULL)
libsystemd_libadd = \
$(GLIB_LIBS) \
$(CODE_COVERAGE_LDFLAGS) \
$(NULL)
noinst_LTLIBRARIES += shared/systemd/libnm-systemd-logging-stub.la noinst_LTLIBRARIES += shared/systemd/libnm-systemd-logging-stub.la
shared_systemd_libnm_systemd_logging_stub_la_CPPFLAGS = \ shared_systemd_libnm_systemd_logging_stub_la_CPPFLAGS = \
@ -1649,7 +1644,8 @@ shared_systemd_libnm_systemd_logging_stub_la_SOURCES = \
$(NULL) $(NULL)
shared_systemd_libnm_systemd_logging_stub_la_LIBADD = \ shared_systemd_libnm_systemd_logging_stub_la_LIBADD = \
$(libsystemd_libadd) \ $(GLIB_LIBS) \
$(CODE_COVERAGE_LDFLAGS) \
$(NULL) $(NULL)
noinst_LTLIBRARIES += shared/systemd/libnm-systemd-shared.la noinst_LTLIBRARIES += shared/systemd/libnm-systemd-shared.la
@ -1775,7 +1771,8 @@ shared_systemd_libnm_systemd_shared_la_SOURCES = \
$(NULL) $(NULL)
shared_systemd_libnm_systemd_shared_la_LIBADD = \ shared_systemd_libnm_systemd_shared_la_LIBADD = \
$(libsystemd_libadd) \ $(GLIB_LIBS) \
$(CODE_COVERAGE_LDFLAGS) \
$(NULL) $(NULL)
############################################################################### ###############################################################################
@ -1794,7 +1791,8 @@ src_libnm_systemd_core_la_cppflags = \
$(NULL) $(NULL)
src_libnm_systemd_core_la_libadd = \ src_libnm_systemd_core_la_libadd = \
$(libsystemd_libadd) \ $(GLIB_LIBS) \
$(CODE_COVERAGE_LDFLAGS) \
$(NULL) $(NULL)
src_libnm_systemd_core_la_SOURCES = \ src_libnm_systemd_core_la_SOURCES = \
@ -1862,7 +1860,10 @@ src_libnm_systemd_core_la_SOURCES = \
src/systemd/src/systemd/sd-ndisc.h src/systemd/src/systemd/sd-ndisc.h
src_libnm_systemd_core_la_CPPFLAGS = $(src_libnm_systemd_core_la_cppflags) src_libnm_systemd_core_la_CPPFLAGS = $(src_libnm_systemd_core_la_cppflags)
src_libnm_systemd_core_la_LIBADD = $(src_libnm_systemd_core_la_libadd) src_libnm_systemd_core_la_LIBADD = \
$(GLIB_LIBS) \
$(CODE_COVERAGE_LDFLAGS) \
$(NULL)
$(src_libnm_systemd_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_libnm_systemd_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
EXTRA_DIST += \ EXTRA_DIST += \
@ -3845,7 +3846,8 @@ src_tests_test_systemd_LDADD = \
src/libnm-systemd-core.la \ src/libnm-systemd-core.la \
shared/systemd/libnm-systemd-shared.la \ shared/systemd/libnm-systemd-shared.la \
shared/libcsiphash.la \ shared/libcsiphash.la \
$(src_libnm_systemd_core_la_libadd) \ $(GLIB_LIBS) \
$(CODE_COVERAGE_LDFLAGS) \
$(NULL) $(NULL)
$(src_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums) $(src_tests_test_systemd_OBJECTS): $(libnm_core_lib_h_pub_mkenums)