mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-01 22:05:45 +00:00
build: move check_so_symbols for settings plugins to parent makefile
Like for the device plugins, check_so_symbols is called from the Makefile of the plugin itself, not from tests/Makefile.am. Just keep it consistent.
This commit is contained in:
parent
cc78d89796
commit
38d669d5ee
|
@ -2,6 +2,8 @@ SUBDIRS = . tests
|
||||||
|
|
||||||
@GNOME_CODE_COVERAGE_RULES@
|
@GNOME_CODE_COVERAGE_RULES@
|
||||||
|
|
||||||
|
include $(top_srcdir)/nm.mk
|
||||||
|
|
||||||
pkglib_LTLIBRARIES = libnm-settings-plugin-ibft.la
|
pkglib_LTLIBRARIES = libnm-settings-plugin-ibft.la
|
||||||
|
|
||||||
noinst_LTLIBRARIES = libnms-ibft-core.la
|
noinst_LTLIBRARIES = libnms-ibft-core.la
|
||||||
|
@ -42,4 +44,9 @@ libnm_settings_plugin_ibft_la_LIBADD = \
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
|
check-local:
|
||||||
|
$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ibft.so)
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
CLEANFILES = $(BUILT_SOURCES)
|
CLEANFILES = $(BUILT_SOURCES)
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
if ENABLE_TESTS
|
if ENABLE_TESTS
|
||||||
|
|
||||||
include $(top_srcdir)/nm.mk
|
|
||||||
|
|
||||||
@GNOME_CODE_COVERAGE_RULES@
|
@GNOME_CODE_COVERAGE_RULES@
|
||||||
|
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
|
@ -36,9 +34,6 @@ test_ibft_LDADD = \
|
||||||
@VALGRIND_RULES@
|
@VALGRIND_RULES@
|
||||||
TESTS = test-ibft
|
TESTS = test-ibft
|
||||||
|
|
||||||
check-local:
|
|
||||||
$(call check_so_symbols,$(builddir)/../.libs/libnm-settings-plugin-ibft.so)
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
|
|
|
@ -2,6 +2,8 @@ SUBDIRS = . tests
|
||||||
|
|
||||||
@GNOME_CODE_COVERAGE_RULES@
|
@GNOME_CODE_COVERAGE_RULES@
|
||||||
|
|
||||||
|
include $(top_srcdir)/nm.mk
|
||||||
|
|
||||||
pkglib_LTLIBRARIES = \
|
pkglib_LTLIBRARIES = \
|
||||||
libnm-settings-plugin-ifcfg-rh.la
|
libnm-settings-plugin-ifcfg-rh.la
|
||||||
|
|
||||||
|
@ -78,6 +80,11 @@ libnm_settings_plugin_ifcfg_rh_la_LIBADD = \
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
|
check-local:
|
||||||
|
$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ifcfg-rh.so)
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
dbusservicedir = $(DBUS_SYS_DIR)
|
dbusservicedir = $(DBUS_SYS_DIR)
|
||||||
dbusservice_DATA = nm-ifcfg-rh.conf
|
dbusservice_DATA = nm-ifcfg-rh.conf
|
||||||
|
|
||||||
|
@ -87,3 +94,4 @@ EXTRA_DIST = \
|
||||||
|
|
||||||
CLEANFILES = $(BUILT_SOURCES)
|
CLEANFILES = $(BUILT_SOURCES)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
if ENABLE_TESTS
|
if ENABLE_TESTS
|
||||||
|
|
||||||
include $(top_srcdir)/nm.mk
|
|
||||||
|
|
||||||
SUBDIRS=network-scripts
|
SUBDIRS=network-scripts
|
||||||
|
|
||||||
@GNOME_CODE_COVERAGE_RULES@
|
@GNOME_CODE_COVERAGE_RULES@
|
||||||
|
@ -40,7 +38,4 @@ test_ifcfg_rh_LDADD = \
|
||||||
@VALGRIND_RULES@
|
@VALGRIND_RULES@
|
||||||
TESTS = test-ifcfg-rh
|
TESTS = test-ifcfg-rh
|
||||||
|
|
||||||
check-local:
|
|
||||||
$(call check_so_symbols,$(builddir)/../.libs/libnm-settings-plugin-ifcfg-rh.so)
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
|
@ -2,6 +2,8 @@ SUBDIRS = . tests
|
||||||
|
|
||||||
@GNOME_CODE_COVERAGE_RULES@
|
@GNOME_CODE_COVERAGE_RULES@
|
||||||
|
|
||||||
|
include $(top_srcdir)/nm.mk
|
||||||
|
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src \
|
-I$(top_srcdir)/src \
|
||||||
-I$(top_srcdir)/src/platform \
|
-I$(top_srcdir)/src/platform \
|
||||||
|
@ -47,3 +49,8 @@ libnm_settings_plugin_ifnet_la_LDFLAGS = \
|
||||||
|
|
||||||
libnm_settings_plugin_ifnet_la_LIBADD = \
|
libnm_settings_plugin_ifnet_la_LIBADD = \
|
||||||
libnms-ifnet-core.la
|
libnms-ifnet-core.la
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
check-local:
|
||||||
|
$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ifnet.so)
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
if ENABLE_TESTS
|
if ENABLE_TESTS
|
||||||
|
|
||||||
include $(top_srcdir)/nm.mk
|
|
||||||
|
|
||||||
@GNOME_CODE_COVERAGE_RULES@
|
@GNOME_CODE_COVERAGE_RULES@
|
||||||
|
|
||||||
AM_CPPFLAGS= \
|
AM_CPPFLAGS= \
|
||||||
|
@ -39,9 +37,6 @@ test_ifnet_LDADD = \
|
||||||
@VALGRIND_RULES@
|
@VALGRIND_RULES@
|
||||||
TESTS = test-ifnet
|
TESTS = test-ifnet
|
||||||
|
|
||||||
check-local:
|
|
||||||
$(call check_so_symbols,$(builddir)/../.libs/libnm-settings-plugin-ifnet.so)
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
|
|
|
@ -2,6 +2,8 @@ SUBDIRS = . tests
|
||||||
|
|
||||||
@GNOME_CODE_COVERAGE_RULES@
|
@GNOME_CODE_COVERAGE_RULES@
|
||||||
|
|
||||||
|
include $(top_srcdir)/nm.mk
|
||||||
|
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/src \
|
-I$(top_srcdir)/src \
|
||||||
-I$(top_srcdir)/src/settings \
|
-I$(top_srcdir)/src/settings \
|
||||||
|
@ -43,3 +45,7 @@ libnm_settings_plugin_ifupdown_la_LDFLAGS = \
|
||||||
libnm_settings_plugin_ifupdown_la_LIBADD = \
|
libnm_settings_plugin_ifupdown_la_LIBADD = \
|
||||||
libnms-ifupdown-core.la
|
libnms-ifupdown-core.la
|
||||||
|
|
||||||
|
###############################################################################
|
||||||
|
|
||||||
|
check-local:
|
||||||
|
$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ifupdown.so)
|
||||||
|
|
|
@ -1,7 +1,5 @@
|
||||||
if ENABLE_TESTS
|
if ENABLE_TESTS
|
||||||
|
|
||||||
include $(top_srcdir)/nm.mk
|
|
||||||
|
|
||||||
AM_CPPFLAGS = \
|
AM_CPPFLAGS = \
|
||||||
-I$(top_srcdir)/shared \
|
-I$(top_srcdir)/shared \
|
||||||
-I$(top_builddir)/shared \
|
-I$(top_builddir)/shared \
|
||||||
|
@ -31,9 +29,6 @@ test_ifupdown_LDADD = \
|
||||||
@VALGRIND_RULES@
|
@VALGRIND_RULES@
|
||||||
TESTS = test-ifupdown
|
TESTS = test-ifupdown
|
||||||
|
|
||||||
check-local:
|
|
||||||
$(call check_so_symbols,$(builddir)/../.libs/libnm-settings-plugin-ifupdown.so)
|
|
||||||
|
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EXTRA_DIST = \
|
EXTRA_DIST = \
|
||||||
|
|
Loading…
Reference in a new issue