system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-01 22:05:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: move check_so_symbols for settings plugins to parent makefile

Browse source 
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:
Thomas Haller 2016-10-12 10:06:58 +02:00
parent cc78d89796
commit 38d669d5ee
8 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/settings/plugins/ibft/Makefile.am
View file

@ -2,6 +2,8 @@ SUBDIRS = . tests
@GNOME_CODE_COVERAGE_RULES@
include $(top_srcdir)/nm.mk
pkglib_LTLIBRARIES = libnm-settings-plugin-ibft.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)

5
src/settings/plugins/ibft/tests/Makefile.am
View file

@ -1,7 +1,5 @@
if ENABLE_TESTS
include $(top_srcdir)/nm.mk
@GNOME_CODE_COVERAGE_RULES@
AM_CPPFLAGS = \
@ -36,9 +34,6 @@ test_ibft_LDADD = \
@VALGRIND_RULES@
TESTS = test-ibft
check-local:
$(call check_so_symbols,$(builddir)/../.libs/libnm-settings-plugin-ibft.so)
endif
EXTRA_DIST = \

8
src/settings/plugins/ifcfg-rh/Makefile.am
View file

@ -2,6 +2,8 @@ SUBDIRS = . tests
@GNOME_CODE_COVERAGE_RULES@
include $(top_srcdir)/nm.mk
pkglib_LTLIBRARIES = \
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)
dbusservice_DATA = nm-ifcfg-rh.conf
@ -87,3 +94,4 @@ EXTRA_DIST = \
CLEANFILES = $(BUILT_SOURCES)

5
src/settings/plugins/ifcfg-rh/tests/Makefile.am
View file

@ -1,7 +1,5 @@
if ENABLE_TESTS
include $(top_srcdir)/nm.mk
SUBDIRS=network-scripts
@GNOME_CODE_COVERAGE_RULES@
@ -40,7 +38,4 @@ test_ifcfg_rh_LDADD = \
@VALGRIND_RULES@
TESTS = test-ifcfg-rh
check-local:
$(call check_so_symbols,$(builddir)/../.libs/libnm-settings-plugin-ifcfg-rh.so)
endif

7
src/settings/plugins/ifnet/Makefile.am
View file

@ -2,6 +2,8 @@ SUBDIRS = . tests
@GNOME_CODE_COVERAGE_RULES@
include $(top_srcdir)/nm.mk
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/platform \
@ -47,3 +49,8 @@ libnm_settings_plugin_ifnet_la_LDFLAGS = \
libnm_settings_plugin_ifnet_la_LIBADD = \
libnms-ifnet-core.la
###############################################################################
check-local:
$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ifnet.so)

5
src/settings/plugins/ifnet/tests/Makefile.am
View file

@ -1,7 +1,5 @@
if ENABLE_TESTS
include $(top_srcdir)/nm.mk
@GNOME_CODE_COVERAGE_RULES@
AM_CPPFLAGS= \
@ -39,9 +37,6 @@ test_ifnet_LDADD = \
@VALGRIND_RULES@
TESTS = test-ifnet
check-local:
$(call check_so_symbols,$(builddir)/../.libs/libnm-settings-plugin-ifnet.so)
endif
EXTRA_DIST = \

6
src/settings/plugins/ifupdown/Makefile.am
View file

@ -2,6 +2,8 @@ SUBDIRS = . tests
@GNOME_CODE_COVERAGE_RULES@
include $(top_srcdir)/nm.mk
AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/settings \
@ -43,3 +45,7 @@ libnm_settings_plugin_ifupdown_la_LDFLAGS = \
libnm_settings_plugin_ifupdown_la_LIBADD = \
libnms-ifupdown-core.la
###############################################################################
check-local:
$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ifupdown.so)

5
src/settings/plugins/ifupdown/tests/Makefile.am
View file

@ -1,7 +1,5 @@
if ENABLE_TESTS
include $(top_srcdir)/nm.mk
AM_CPPFLAGS = \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
@ -31,9 +29,6 @@ test_ifupdown_LDADD = \
@VALGRIND_RULES@
TESTS = test-ifupdown
check-local:
$(call check_so_symbols,$(builddir)/../.libs/libnm-settings-plugin-ifupdown.so)
endif
EXTRA_DIST = \