fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-01-10 22:10:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: merge "src/settings/plugins/ibft/Makefile.am" into toplevel Makefile

Browse source
This commit is contained in:
Thomas Haller 2016-10-16 00:07:01 +02:00
parent 541f543451
commit f87d153f8a
5 changed files with 96 additions and 108 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

96
Makefile.am
View file

@ -16,6 +16,7 @@ noinst_DATA =
sbin_PROGRAMS =
libexec_PROGRAMS =
lib_LTLIBRARIES =
pkglib_LTLIBRARIES =
CLEANFILES =
DISTCLEANFILES =
EXTRA_DIST =
@ -1651,6 +1652,101 @@ EXTRA_DIST += \
src/settings/plugins/keyfile/tests/keyfiles/test-ca-cert.pem \
src/settings/plugins/keyfile/tests/keyfiles/test-key-and-cert.pem
###############################################################################
# src/settings/plugins/ibft
###############################################################################
if CONFIG_PLUGIN_IBFT
pkglib_LTLIBRARIES += src/settings/plugins/ibft/libnm-settings-plugin-ibft.la
noinst_LTLIBRARIES += src/settings/plugins/ibft/libnms-ibft-core.la
src_settings_plugins_ibft_cppflags = \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DSBINDIR=\"$(sbindir)\"
src_settings_plugins_ibft_libnms_ibft_core_la_CPPFLAGS = $(src_settings_plugins_ibft_cppflags)
src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES = \
src/settings/plugins/ibft/nms-ibft-reader.c \
src/settings/plugins/ibft/nms-ibft-reader.h
src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_SOURCES = \
src/settings/plugins/ibft/nms-ibft-plugin.c \
src/settings/plugins/ibft/nms-ibft-plugin.h \
src/settings/plugins/ibft/nms-ibft-connection.c \
src/settings/plugins/ibft/nms-ibft-connection.h
src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_CPPFLAGS = $(src_settings_plugins_ibft_cppflags)
src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LDFLAGS = \
-module -avoid-version \
-Wl,--version-script="$(srcdir)/linker-script-settings.ver"
src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LIBADD = \
src/settings/plugins/ibft/libnms-ibft-core.la
if ENABLE_TESTS
noinst_PROGRAMS += src/settings/plugins/ibft/tests/test-ibft
src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(srcdir)/src/settings/plugins/ibft \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DTEST_IBFT_DIR=\"$(abs_srcdir)/src/settings/plugins/ibft/tests\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/src/settings/plugins/ibft/tests\"
src_settings_plugins_ibft_tests_test_ibft_LDFLAGS = \
$(GLIB_LIBS) \
$(CODE_COVERAGE_LDFLAGS)
src_settings_plugins_ibft_tests_test_ibft_LDADD = \
src/settings/plugins/ibft/libnms-ibft-core.la \
src/libNetworkManager.la
TESTS += src/settings/plugins/ibft/tests/test-ibft
endif
EXTRA_DIST += \
src/settings/plugins/ibft/tests/iscsiadm-test-dhcp \
src/settings/plugins/ibft/tests/iscsiadm-test-static \
src/settings/plugins/ibft/tests/iscsiadm-test-bad-ipaddr \
src/settings/plugins/ibft/tests/iscsiadm-test-bad-gateway \
src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns1 \
src/settings/plugins/ibft/tests/iscsiadm-test-bad-dns2 \
src/settings/plugins/ibft/tests/iscsiadm-test-bad-entry \
src/settings/plugins/ibft/tests/iscsiadm-test-bad-record \
src/settings/plugins/ibft/tests/iscsiadm-test-vlan
check-local-symbols-settings-ibft: src/settings/plugins/ibft/libnm-settings-plugin-ibft.la
$(call check_so_symbols,$(builddir)/src/settings/plugins/ibft/.libs/libnm-settings-plugin-ibft.so)
check_local += check-local-symbols-settings-ibft
endif
###############################################################################
girdir = $(datadir)/gir-1.0

2
configure.ac
View file

@ -1148,8 +1148,6 @@ src/settings/plugins/ifnet/tests/Makefile
src/settings/plugins/ifcfg-rh/Makefile
src/settings/plugins/ifcfg-rh/tests/Makefile
src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile
src/settings/plugins/ibft/Makefile
src/settings/plugins/ibft/tests/Makefile
src/platform/Makefile
src/platform/tests/Makefile
src/rdisc/Makefile

4
src/settings/plugins/Makefile.am
View file

@ -2,10 +2,6 @@ SUBDIRS=
@GNOME_CODE_COVERAGE_RULES@
if CONFIG_PLUGIN_IBFT
SUBDIRS+=ibft
endif
if CONFIG_PLUGIN_IFCFG_RH
SUBDIRS+=ifcfg-rh
endif

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

@ -1,53 +0,0 @@
SUBDIRS = . tests
@GNOME_CODE_COVERAGE_RULES@
include $(top_srcdir)/nm.mk
pkglib_LTLIBRARIES = libnm-settings-plugin-ibft.la
noinst_LTLIBRARIES = libnms-ibft-core.la
AM_CPPFLAGS = \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
$(GLIB_CFLAGS) \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
-DSBINDIR=\"$(sbindir)\"
###############################################################################
libnms_ibft_core_la_SOURCES = \
nms-ibft-reader.c \
nms-ibft-reader.h
###############################################################################
libnm_settings_plugin_ibft_la_SOURCES = \
nms-ibft-plugin.c \
nms-ibft-plugin.h \
nms-ibft-connection.c \
nms-ibft-connection.h
libnm_settings_plugin_ibft_la_LDFLAGS = \
-module -avoid-version \
-Wl,--version-script="$(top_srcdir)/linker-script-settings.ver"
libnm_settings_plugin_ibft_la_LIBADD = \
libnms-ibft-core.la
###############################################################################
check-local:
$(call check_so_symbols,$(builddir)/.libs/libnm-settings-plugin-ibft.so)
###############################################################################
CLEANFILES = $(BUILT_SOURCES)

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

@ -1,49 +0,0 @@
if ENABLE_TESTS
@GNOME_CODE_COVERAGE_RULES@
AM_CPPFLAGS = \
$(GLIB_CFLAGS) \
$(CODE_COVERAGE_CFLAGS) \
-I$(top_srcdir)/shared \
-I$(top_builddir)/shared \
-I$(top_srcdir)/libnm-core \
-I$(top_builddir)/libnm-core \
-I$(top_srcdir)/src/ \
-I$(top_srcdir)/src/platform \
-I$(top_srcdir)/src/settings \
-I$(srcdir)/../ \
-DG_LOG_DOMAIN=\""NetworkManager"\" \
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_INSIDE_DAEMON \
-DTEST_IBFT_DIR=\"$(abs_srcdir)\" \
-DTEST_SCRATCH_DIR=\"$(abs_builddir)/\"
AM_LDFLAGS = \
$(GLIB_LIBS) \
$(CODE_COVERAGE_LDFLAGS)
noinst_PROGRAMS = test-ibft
test_ibft_SOURCES = \
test-ibft.c
test_ibft_LDADD = \
$(top_builddir)/src/settings/plugins/ibft/libnms-ibft-core.la \
$(top_builddir)/src/libNetworkManager.la
@NM_LOG_COMPILER@
TESTS = test-ibft
endif
EXTRA_DIST = \
iscsiadm-test-dhcp \
iscsiadm-test-static \
iscsiadm-test-bad-ipaddr \
iscsiadm-test-bad-gateway \
iscsiadm-test-bad-dns1 \
iscsiadm-test-bad-dns2 \
iscsiadm-test-bad-entry \
iscsiadm-test-bad-record \
iscsiadm-test-vlan