mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-05-05 06:28:05 +02:00
build: merge branch 'th/build-flags'
https://github.com/NetworkManager/NetworkManager/pull/167
This commit is contained in:
Thomas Haller
commit
2936203066
35 changed files with 230 additions and 367 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -47,6 +47,7 @@ test-*.trs
|
|||
/autom4te.cache
|
||||
/build-aux
|
||||
/config.*
|
||||
/config-extra.h
|
||||
/configure
|
||||
/intltool-*
|
||||
|
||||
|
|
|
|||
12
.travis.yml
12
.travis.yml
|
|
@ -104,15 +104,19 @@ script:
|
|||
- |
|
||||
if test "$BUILD_TYPE" == 'autotools'; then
|
||||
git clean -fdx &&
|
||||
./autogen.sh --prefix="$PWD/INST" --with-systemd-logind=no --enable-more-warnings=no --enable-ifcfg-rh --enable-config-plugin-ibft --enable-ifupdown --enable-tests &&
|
||||
NOCONFIGURE=1 ./autogen.sh &&
|
||||
mkdir ./build &&
|
||||
pushd ./build &&
|
||||
../configure --prefix="$PWD/INST" --with-systemd-logind=no --enable-more-warnings=no --enable-ifcfg-rh --enable-config-plugin-ibft --enable-ifupdown --enable-tests &&
|
||||
make -j4 &&
|
||||
if [ "$CC" == gcc ]; then
|
||||
sudo locale-gen pl_PL.UTF-8 &&
|
||||
sudo make install &&
|
||||
NM_TEST_CLIENT_CHECK_L10N=1 ./contrib/travis/travis-check.sh
|
||||
NM_TEST_CLIENT_CHECK_L10N=1 ../contrib/travis/travis-check.sh
|
||||
else
|
||||
./contrib/travis/travis-check.sh
|
||||
fi
|
||||
../contrib/travis/travis-check.sh
|
||||
fi &&
|
||||
popd
|
||||
fi
|
||||
|
||||
env:
|
||||
|
|
|
|||
412
Makefile.am
412
Makefile.am
|
|
@ -105,12 +105,47 @@ endif
|
|||
|
||||
endif
|
||||
|
||||
dflt_cppflags = -std=gnu99
|
||||
|
||||
###############################################################################
|
||||
|
||||
nm_build_cflags = \
|
||||
-DNM_BUILD_SRCDIR=\"$(abs_srcdir)\" \
|
||||
-DNM_BUILD_BUILDDIR=\"$(abs_builddir)\" \
|
||||
$(NULL)
|
||||
# with autotools, it is not easily possible to generate these defines
|
||||
# from configure.ac.
|
||||
#
|
||||
# See https://www.gnu.org/software/autoconf/manual/autoconf-2.63/html_node/Installation-Directory-Variables.html
|
||||
#
|
||||
# With meson-only, they could just be set via config.h.meson
|
||||
config-extra.h: Makefile
|
||||
$(AM_V_GEN) \
|
||||
echo "/* Generated by Makefile.am */" >$@ && \
|
||||
echo "#define BINDIR \"$(bindir)\"" >>$@ && \
|
||||
echo "#define DATADIR \"$(datadir)\"" >>$@ && \
|
||||
echo "#define DHCLIENT_PATH \"$(DHCLIENT_PATH)\"" >>$@ && \
|
||||
echo "#define DHCPCANON_PATH \"$(DHCPCANON_PATH)\"" >>$@ && \
|
||||
echo "#define DHCPCD_PATH \"$(DHCPCD_PATH)\"" >>$@ && \
|
||||
echo "#define LIBEXECDIR \"$(libexecdir)\"" >>$@ && \
|
||||
echo "#define LOCALSTATEDIR \"$(localstatedir)\"" >>$@ && \
|
||||
echo "#define NMCONFDIR \"$(nmconfdir)\"" >>$@ && \
|
||||
echo "#define NMLIBDIR \"$(nmlibdir)\"" >>$@ && \
|
||||
echo "#define NMLOCALEDIR \"$(nmlocaledir)\"" >>$@ && \
|
||||
echo "#define NMPLUGINDIR \"$(plugindir)\"" >>$@ && \
|
||||
echo "#define NMRUNDIR \"$(nmrundir)\"" >>$@ && \
|
||||
echo "#define NMSTATEDIR \"$(nmstatedir)\"" >>$@ && \
|
||||
echo "#define NMVPNDIR \"$(pkglibdir)\"" >>$@ && \
|
||||
echo "#define NM_BUILD_BUILDDIR \"$(abs_builddir)\"" >>$@ && \
|
||||
echo "#define NM_BUILD_SRCDIR \"$(abs_srcdir)\"" >>$@ && \
|
||||
echo "#define PPPD_PLUGIN_DIR \"$(PPPD_PLUGIN_DIR)\"" >>$@ && \
|
||||
echo "#define PREFIX \"$(prefix)\"" >>$@ && \
|
||||
echo "#define RUNDIR \"$(rundir)\"" >>$@ && \
|
||||
echo "#define RUNSTATEDIR \"$(runstatedir)\"" >>$@ && \
|
||||
echo "#define SYSCONFDIR \"$(sysconfdir)\"" >>$@ && \
|
||||
true
|
||||
|
||||
DISTCLEANFILES += config-extra.h
|
||||
|
||||
libnm-core/.dirstamp: config-extra.h
|
||||
|
||||
###############################################################################
|
||||
|
||||
set_sanitizer_env = \
|
||||
[ -n "$(SANITIZER_ENV)" ] && export $(SANITIZER_ENV) ; \
|
||||
|
|
@ -559,6 +594,7 @@ nodist_libnminclude_HEADERS += \
|
|||
###############################################################################
|
||||
|
||||
dflt_cppflags_libnm_core = \
|
||||
$(dflt_cppflags) \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-core \
|
||||
|
|
@ -566,7 +602,8 @@ dflt_cppflags_libnm_core = \
|
|||
$(CODE_COVERAGE_CFLAGS) \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(LIBUDEV_CFLAGS) \
|
||||
$(SANITIZER_LIB_CFLAGS)
|
||||
$(SANITIZER_LIB_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
if WITH_GNUTLS
|
||||
dflt_cppflags_libnm_core += $(GNUTLS_CFLAGS)
|
||||
|
|
@ -604,12 +641,6 @@ libnm_core_libnm_core_la_CPPFLAGS = \
|
|||
$(dflt_cppflags_libnm_core) \
|
||||
-DG_LOG_DOMAIN=\""libnm"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
|
||||
-DNMLOCALEDIR=\"$(nmlocaledir)\" \
|
||||
-DNMCONFDIR=\"$(nmconfdir)\" \
|
||||
-DNMLIBDIR=\"$(nmlibdir)\" \
|
||||
-DNMVPNDIR=\"$(pkglibdir)\" \
|
||||
-DNMPLUGINDIR=\"$(plugindir)\" \
|
||||
-DLIBEXECDIR=\"$(libexecdir)\" \
|
||||
$(NULL)
|
||||
|
||||
if WITH_JSON_VALIDATION
|
||||
|
|
@ -691,12 +722,12 @@ libnm-core/tests/nm-core-tests-enum-types.c.stamp: libnm-core/tests/.dirstamp
|
|||
$(libnm_core_tests_test_general_OBJECTS): libnm-core/tests/nm-core-tests-enum-types.h
|
||||
|
||||
libnm_core_tests_cppflags = \
|
||||
$(dflt_cppflags_libnm_core) \
|
||||
-I$(srcdir)/libnm-core/tests \
|
||||
-I$(builddir)/libnm-core/tests \
|
||||
$(nm_build_cflags) \
|
||||
$(dflt_cppflags_libnm_core) \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \
|
||||
$(SANITIZER_EXEC_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
libnm_core_tests_test_compare_CPPFLAGS = $(libnm_core_tests_cppflags)
|
||||
|
|
@ -892,9 +923,9 @@ libnm_lib_c_mkenums = \
|
|||
libnm/nm-enum-types.c
|
||||
|
||||
libnm_lib_cppflags = \
|
||||
$(dflt_cppflags_libnm_core) \
|
||||
-I$(srcdir)/libnm \
|
||||
-I$(builddir)/libnm \
|
||||
$(dflt_cppflags_libnm_core) \
|
||||
-DG_LOG_DOMAIN=\""libnm"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
|
||||
$(NULL)
|
||||
|
|
@ -1015,7 +1046,7 @@ INTROSPECTION_GIRS += libnm/NM-1.0.gir
|
|||
if WITH_FAKE_TYPELIBS
|
||||
|
||||
libnm/fake-typelib/NetworkManager.typelib: libnm/fake-typelib/NetworkManager.gir libnm/fake-typelib/.dirstamp
|
||||
$(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@
|
||||
$(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@
|
||||
|
||||
libnm/fake-typelib/NMClient.typelib: libnm/fake-typelib/NMClient.gir libnm/fake-typelib/.dirstamp
|
||||
$(AM_V_GEN) $(INTROSPECTION_COMPILER) $< -o $@
|
||||
|
|
@ -1115,12 +1146,12 @@ check_programs_norun += $(libnm_tests_programs_req_introspection)
|
|||
endif
|
||||
|
||||
libnm_tests_cppflags = \
|
||||
$(dflt_cppflags_libnm_core) \
|
||||
-I$(srcdir)/libnm \
|
||||
-I$(builddir)/libnm \
|
||||
$(nm_build_cflags) \
|
||||
$(dflt_cppflags_libnm_core) \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM \
|
||||
$(SANITIZER_EXEC_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
libnm_tests_ldadd = \
|
||||
|
|
@ -1188,6 +1219,7 @@ libnm_tests_libnm_vpn_plugin_utils_test_la_SOURCES = \
|
|||
shared/nm-utils/nm-vpn-plugin-utils.h
|
||||
|
||||
libnm_tests_libnm_vpn_plugin_utils_test_la_CFLAGS = \
|
||||
$(dflt_cppflags) \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-core \
|
||||
|
|
@ -1209,35 +1241,24 @@ EXTRA_DIST += \
|
|||
# src/
|
||||
###############################################################################
|
||||
|
||||
src_cppflags = \
|
||||
$(dflt_cppflags_libnm_core) \
|
||||
src_cppflags_base = \
|
||||
-I$(srcdir)/src \
|
||||
-I$(builddir)/src \
|
||||
\
|
||||
-DPREFIX=\"$(prefix)\" \
|
||||
$(dflt_cppflags_libnm_core) \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
|
||||
$(SANITIZER_EXEC_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
src_cppflags_base_test = \
|
||||
$(src_cppflags_base) \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
$(NULL)
|
||||
|
||||
src_cppflags_device_plugin = \
|
||||
$(src_cppflags_base)
|
||||
|
||||
src_cppflags = \
|
||||
$(src_cppflags_base) \
|
||||
\
|
||||
-DBINDIR=\"$(bindir)\" \
|
||||
-DDATADIR=\"$(datadir)\" \
|
||||
-DLIBEXECDIR=\"$(libexecdir)\" \
|
||||
-DLOCALSTATEDIR=\"$(localstatedir)\" \
|
||||
-DRUNSTATEDIR=\"$(runstatedir)\" \
|
||||
-DSBINDIR=\"$(sbindir)\" \
|
||||
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||
-DRUNDIR=\"$(rundir)\" \
|
||||
\
|
||||
-DNMCONFDIR=\"$(nmconfdir)\" \
|
||||
-DNMLOCALEDIR=\"$(nmlocaledir)\" \
|
||||
-DNMPLUGINDIR=\"$(plugindir)\" \
|
||||
-DNMRUNDIR=\"$(nmrundir)\" \
|
||||
-DNMSTATEDIR=\"$(nmstatedir)\" \
|
||||
-DNMLIBDIR=\"$(nmlibdir)\" \
|
||||
\
|
||||
-DDHCPCANON_PATH=\"$(DHCPCANON_PATH)\" \
|
||||
-DDHCLIENT_PATH=\"$(DHCLIENT_PATH)\" \
|
||||
-DDHCPCD_PATH=\"$(DHCPCD_PATH)\" \
|
||||
\
|
||||
$(LIBUDEV_CFLAGS) \
|
||||
$(LIBNDP_CFLAGS) \
|
||||
$(LIBPSL_CFLAGS) \
|
||||
$(LIBCURL_CFLAGS) \
|
||||
|
|
@ -1245,10 +1266,18 @@ src_cppflags = \
|
|||
$(LIBAUDIT_CFLAGS) \
|
||||
$(SYSTEMD_LOGIN_CFLAGS) \
|
||||
$(SYSTEMD_JOURNAL_CFLAGS) \
|
||||
$(SANITIZER_EXEC_CFLAGS) \
|
||||
\
|
||||
$(NULL)
|
||||
|
||||
src_cppflags_test = \
|
||||
$(src_cppflags) \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
$(NULL)
|
||||
|
||||
if REQUIRE_ROOT_TESTS
|
||||
src_cppflags_test += -DREQUIRE_ROOT_TESTS=1
|
||||
endif
|
||||
|
||||
src_ldflags = $(CODE_COVERAGE_LDFLAGS)
|
||||
|
||||
sbin_PROGRAMS += \
|
||||
|
|
@ -1297,6 +1326,7 @@ EXTRA_DIST += shared/c-list/src/c-list.h
|
|||
###############################################################################
|
||||
|
||||
src_libsystemd_nm_la_cppflags = \
|
||||
$(dflt_cppflags) \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-core \
|
||||
|
|
@ -1752,19 +1782,10 @@ $(src_libNetworkManager_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
|||
|
||||
check_ltlibraries += src/libNetworkManagerTest.la
|
||||
|
||||
src_tests_cppflags = \
|
||||
$(src_cppflags) \
|
||||
$(SANITIZER_EXEC_CFLAGS) \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST
|
||||
src_tests_cppflags_fake = $(src_cppflags_test) -DSETUP=nm_fake_platform_setup
|
||||
src_tests_cppflags_linux = $(src_cppflags_test) -DSETUP=nm_linux_platform_setup
|
||||
|
||||
if REQUIRE_ROOT_TESTS
|
||||
src_tests_cppflags += -DREQUIRE_ROOT_TESTS=1
|
||||
endif
|
||||
|
||||
src_tests_cppflags_fake = $(src_tests_cppflags) -DSETUP=nm_fake_platform_setup
|
||||
src_tests_cppflags_linux = $(src_tests_cppflags) -DSETUP=nm_linux_platform_setup
|
||||
|
||||
src_libNetworkManagerTest_la_CPPFLAGS = $(src_tests_cppflags)
|
||||
src_libNetworkManagerTest_la_CPPFLAGS = $(src_cppflags_test)
|
||||
|
||||
src_libNetworkManagerTest_la_SOURCES = \
|
||||
src/ndisc/nm-fake-ndisc.c \
|
||||
|
|
@ -1842,12 +1863,13 @@ EXTRA_DIST += \
|
|||
libexec_PROGRAMS += src/dhcp/nm-dhcp-helper
|
||||
|
||||
src_dhcp_nm_dhcp_helper_CPPFLAGS = \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(dflt_cppflags) \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-DG_LOG_DOMAIN=\""nm-dhcp-helper"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB \
|
||||
-DNMRUNDIR=\"$(nmrundir)\"
|
||||
$(GLIB_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
src_dhcp_nm_dhcp_helper_SOURCES = \
|
||||
src/dhcp/nm-dhcp-helper.c \
|
||||
|
|
@ -1866,10 +1888,7 @@ EXTRA_DIST += \
|
|||
# src/dhcp/tests
|
||||
###############################################################################
|
||||
|
||||
src_dhcp_tests_cppflags = \
|
||||
$(src_tests_cppflags) \
|
||||
$(nm_build_cflags) \
|
||||
$(NULL)
|
||||
src_dhcp_tests_cppflags = $(src_cppflags_test)
|
||||
|
||||
src_dhcp_tests_ldadd = \
|
||||
src/libNetworkManagerTest.la
|
||||
|
|
@ -1906,6 +1925,7 @@ core_plugins += src/ppp/libnm-ppp-plugin.la
|
|||
pppd_plugin_LTLIBRARIES += src/ppp/nm-pppd-plugin.la
|
||||
|
||||
src_ppp_nm_pppd_plugin_la_CPPFLAGS = \
|
||||
$(dflt_cppflags) \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-core \
|
||||
|
|
@ -1937,16 +1957,7 @@ src_ppp_libnm_ppp_plugin_la_SOURCES = \
|
|||
EXTRA_src_ppp_libnm_ppp_plugin_la_DEPENDENCIES = \
|
||||
src/ppp/nm-ppp-plugin.ver
|
||||
|
||||
src_ppp_libnm_ppp_plugin_la_CPPFLAGS = \
|
||||
-I$(srcdir)/src \
|
||||
-I$(builddir)/src \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(builddir)/libnm-core \
|
||||
-I$(srcdir)/libnm-core \
|
||||
-DPPPD_PLUGIN_DIR=\"$(PPPD_PLUGIN_DIR)\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
|
||||
$(GLIB_CFLAGS)
|
||||
src_ppp_libnm_ppp_plugin_la_CPPFLAGS = $(src_cppflags_base)
|
||||
|
||||
src_ppp_libnm_ppp_plugin_la_LDFLAGS = \
|
||||
-module -avoid-version \
|
||||
|
|
@ -1968,10 +1979,7 @@ EXTRA_DIST += \
|
|||
|
||||
check_programs += src/settings/plugins/keyfile/tests/test-keyfile
|
||||
|
||||
src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = \
|
||||
$(src_tests_cppflags) \
|
||||
$(nm_build_cflags) \
|
||||
$(NULL)
|
||||
src_settings_plugins_keyfile_tests_test_keyfile_CPPFLAGS = $(src_cppflags_test)
|
||||
|
||||
src_settings_plugins_keyfile_tests_test_keyfile_LDFLAGS = \
|
||||
$(GLIB_LIBS) \
|
||||
|
|
@ -2035,18 +2043,7 @@ core_plugins += 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$(srcdir)/src \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-core \
|
||||
-I$(builddir)/libnm-core \
|
||||
$(GLIB_CFLAGS) \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
|
||||
-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_CPPFLAGS = $(src_cppflags_base)
|
||||
|
||||
src_settings_plugins_ibft_libnms_ibft_core_la_SOURCES = \
|
||||
src/settings/plugins/ibft/nms-ibft-reader.c \
|
||||
|
|
@ -2060,7 +2057,7 @@ src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_SOURCES = \
|
|||
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_CPPFLAGS = $(src_cppflags_base)
|
||||
|
||||
src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_LDFLAGS = \
|
||||
-module -avoid-version \
|
||||
|
|
@ -2073,18 +2070,7 @@ $(src_settings_plugins_ibft_libnm_settings_plugin_ibft_la_OBJECTS): $(libnm_core
|
|||
|
||||
check_programs += src/settings/plugins/ibft/tests/test-ibft
|
||||
|
||||
src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(CODE_COVERAGE_CFLAGS) \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-core \
|
||||
-I$(builddir)/libnm-core \
|
||||
-I$(srcdir)/src \
|
||||
$(nm_build_cflags) \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
|
||||
$(NULL)
|
||||
src_settings_plugins_ibft_tests_test_ibft_CPPFLAGS = $(src_cppflags_base_test)
|
||||
|
||||
src_settings_plugins_ibft_tests_test_ibft_LDFLAGS = \
|
||||
$(GLIB_LIBS) \
|
||||
|
|
@ -2131,27 +2117,13 @@ noinst_LTLIBRARIES += \
|
|||
src/settings/plugins/ifcfg-rh/libnmdbus-ifcfg-rh.la \
|
||||
src/settings/plugins/ifcfg-rh/libnms-ifcfg-rh-core.la
|
||||
|
||||
src_settings_plugins_ifcfg_rh_cppflags = \
|
||||
-I$(srcdir)/src \
|
||||
-I$(builddir)/src \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-core \
|
||||
-I$(builddir)/libnm-core \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(NSS_CFLAGS) \
|
||||
$(SANITIZER_EXEC_CFLAGS) \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
|
||||
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||
-DSBINDIR=\"$(sbindir)\"
|
||||
|
||||
###############################################################################
|
||||
|
||||
nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES = \
|
||||
src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.c \
|
||||
src/settings/plugins/ifcfg-rh/nmdbus-ifcfg-rh.h
|
||||
|
||||
src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_settings_plugins_ifcfg_rh_cppflags))
|
||||
src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_CPPFLAGS = $(filter-out -DGLIB_VERSION_MAX_ALLOWED%,$(src_cppflags_base))
|
||||
|
||||
CLEANFILES += $(nodist_src_settings_plugins_ifcfg_rh_libnmdbus_ifcfg_rh_la_SOURCES)
|
||||
|
||||
|
|
@ -2181,9 +2153,9 @@ src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_SOURCES = \
|
|||
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.c \
|
||||
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-writer.h
|
||||
|
||||
src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_settings_plugins_ifcfg_rh_cppflags)
|
||||
src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_CPPFLAGS = $(src_cppflags_base)
|
||||
|
||||
$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
||||
$(src_settings_plugins_ifcfg_rh_libnms_ifcfg_rh_core_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
||||
|
||||
###############################################################################
|
||||
|
||||
|
|
@ -2193,7 +2165,7 @@ src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_SOURCES = \
|
|||
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.c \
|
||||
src/settings/plugins/ifcfg-rh/nms-ifcfg-rh-plugin.h
|
||||
|
||||
src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_settings_plugins_ifcfg_rh_cppflags)
|
||||
src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_CPPFLAGS = $(src_cppflags_base)
|
||||
|
||||
src_settings_plugins_ifcfg_rh_libnm_settings_plugin_ifcfg_rh_la_LDFLAGS = \
|
||||
-module -avoid-version \
|
||||
|
|
@ -2220,10 +2192,7 @@ check_programs += src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh
|
|||
src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_SOURCES = \
|
||||
src/settings/plugins/ifcfg-rh/tests/test-ifcfg-rh.c
|
||||
|
||||
src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = \
|
||||
$(src_tests_cppflags) \
|
||||
$(nm_build_cflags) \
|
||||
$(NULL)
|
||||
src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_CPPFLAGS = $(src_cppflags_base_test)
|
||||
|
||||
src_settings_plugins_ifcfg_rh_tests_test_ifcfg_rh_LDFLAGS = \
|
||||
$(GLIB_LIBS) \
|
||||
|
|
@ -2480,25 +2449,13 @@ core_plugins += src/settings/plugins/ifupdown/libnm-settings-plugin-ifupdown.la
|
|||
|
||||
noinst_LTLIBRARIES += src/settings/plugins/ifupdown/libnms-ifupdown-core.la
|
||||
|
||||
src_settings_plugins_ifupdown_cppflags = \
|
||||
-I$(srcdir)/src \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-core \
|
||||
-I$(builddir)/libnm-core \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(LIBUDEV_CFLAGS) \
|
||||
-DSYSCONFDIR=\"$(sysconfdir)\"
|
||||
|
||||
|
||||
src_settings_plugins_ifupdown_libnms_ifupdown_core_la_SOURCES = \
|
||||
src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.c \
|
||||
src/settings/plugins/ifupdown/nms-ifupdown-interface-parser.h \
|
||||
src/settings/plugins/ifupdown/nms-ifupdown-parser.c \
|
||||
src/settings/plugins/ifupdown/nms-ifupdown-parser.h
|
||||
|
||||
src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_settings_plugins_ifupdown_cppflags)
|
||||
src_settings_plugins_ifupdown_libnms_ifupdown_core_la_CPPFLAGS = $(src_cppflags_base)
|
||||
|
||||
src_settings_plugins_ifupdown_libnms_ifupdown_core_la_LIBADD = \
|
||||
$(LIBUDEV_LIBS)
|
||||
|
|
@ -2509,7 +2466,7 @@ src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_SOURCES = \
|
|||
src/settings/plugins/ifupdown/nms-ifupdown-plugin.c \
|
||||
src/settings/plugins/ifupdown/nms-ifupdown-plugin.h
|
||||
|
||||
src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_settings_plugins_ifupdown_cppflags)
|
||||
src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_CPPFLAGS = $(src_cppflags_base)
|
||||
|
||||
src_settings_plugins_ifupdown_libnm_settings_plugin_ifupdown_la_LDFLAGS = \
|
||||
-module -avoid-version \
|
||||
|
|
@ -2530,17 +2487,7 @@ check_local += check-local-symbols-settings-ifupdown
|
|||
|
||||
check_programs += src/settings/plugins/ifupdown/tests/test-ifupdown
|
||||
|
||||
src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-core \
|
||||
-I$(builddir)/libnm-core \
|
||||
-I$(srcdir)/src \
|
||||
$(GLIB_CFLAGS) \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
|
||||
$(nm_build_cflags) \
|
||||
$(NULL)
|
||||
src_settings_plugins_ifupdown_tests_test_ifupdown_CPPFLAGS = $(src_cppflags_base_test)
|
||||
|
||||
src_settings_plugins_ifupdown_tests_test_ifupdown_LDFLAGS = \
|
||||
$(GLIB_LDFLAGS) \
|
||||
|
|
@ -2600,16 +2547,7 @@ src_devices_adsl_libnm_device_plugin_adsl_la_SOURCES = \
|
|||
src/devices/adsl/nm-device-adsl.c \
|
||||
src/devices/adsl/nm-device-adsl.h
|
||||
|
||||
src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = \
|
||||
-I$(srcdir)/src \
|
||||
-I$(builddir)/src \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(builddir)/libnm-core \
|
||||
-I$(srcdir)/libnm-core \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(LIBUDEV_CFLAGS)
|
||||
src_devices_adsl_libnm_device_plugin_adsl_la_CPPFLAGS = $(src_cppflags_device_plugin)
|
||||
|
||||
src_devices_adsl_libnm_device_plugin_adsl_la_LDFLAGS = \
|
||||
-module -avoid-version \
|
||||
|
|
@ -2634,16 +2572,9 @@ EXTRA_DIST += \
|
|||
if WITH_MODEM_MANAGER_1
|
||||
|
||||
src_devices_wwan_cppflags = \
|
||||
-I$(srcdir)/src \
|
||||
-I$(builddir)/src \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-core \
|
||||
-I$(builddir)/libnm-core \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(LIBSYSTEMD_CFLAGS) \
|
||||
$(MM_GLIB_CFLAGS)
|
||||
$(src_cppflags_device_plugin) \
|
||||
$(MM_GLIB_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
core_plugins += src/devices/wwan/libnm-wwan.la
|
||||
|
||||
|
|
@ -2733,15 +2664,7 @@ src_devices_bluetooth_libnm_device_plugin_bluetooth_la_SOURCES = \
|
|||
src/devices/bluetooth/nm-device-bt.c \
|
||||
src/devices/bluetooth/nm-device-bt.h
|
||||
|
||||
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = \
|
||||
-I$(srcdir)/src \
|
||||
-I$(builddir)/src \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(builddir)/libnm-core \
|
||||
-I$(srcdir)/libnm-core \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
|
||||
$(GLIB_CFLAGS)
|
||||
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_CPPFLAGS = $(src_cppflags_device_plugin)
|
||||
|
||||
src_devices_bluetooth_libnm_device_plugin_bluetooth_la_LDFLAGS = \
|
||||
-module -avoid-version \
|
||||
|
|
@ -2801,15 +2724,7 @@ src_devices_wifi_libnm_device_plugin_wifi_la_SOURCES += \
|
|||
src/devices/wifi/nm-iwd-manager.h
|
||||
endif
|
||||
|
||||
src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = \
|
||||
-I$(srcdir)/src \
|
||||
-I$(builddir)/src \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(builddir)/libnm-core \
|
||||
-I$(srcdir)/libnm-core \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
|
||||
$(GLIB_CFLAGS)
|
||||
src_devices_wifi_libnm_device_plugin_wifi_la_CPPFLAGS = $(src_cppflags_device_plugin)
|
||||
|
||||
src_devices_wifi_libnm_device_plugin_wifi_la_LDFLAGS = \
|
||||
-module -avoid-version \
|
||||
|
|
@ -2833,16 +2748,7 @@ src_devices_wifi_tests_test_general_SOURCES = \
|
|||
src/devices/wifi/nm-wifi-utils.c \
|
||||
src/devices/wifi/nm-wifi-utils.h
|
||||
|
||||
src_devices_wifi_tests_test_general_CPPFLAGS = \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-core \
|
||||
-I$(builddir)/libnm-core \
|
||||
-I$(srcdir)/src \
|
||||
-I$(builddir)/src \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
|
||||
$(GLIB_CFLAGS)
|
||||
src_devices_wifi_tests_test_general_CPPFLAGS = $(src_cppflags_base_test)
|
||||
|
||||
src_devices_wifi_tests_test_general_LDADD = src/libNetworkManagerTest.la
|
||||
src_devices_wifi_tests_test_general_LDFLAGS = $(SANITIZER_EXEC_LDFLAGS)
|
||||
|
|
@ -2869,16 +2775,10 @@ src_devices_team_libnm_device_plugin_team_la_SOURCES = \
|
|||
src/devices/team/nm-device-team.h
|
||||
|
||||
src_devices_team_libnm_device_plugin_team_la_CPPFLAGS = \
|
||||
-I$(srcdir)/src \
|
||||
-I$(builddir)/src \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(builddir)/libnm-core \
|
||||
-I$(srcdir)/libnm-core \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
|
||||
$(src_cppflags_device_plugin) \
|
||||
$(LIBTEAMDCTL_CFLAGS) \
|
||||
$(JANSSON_CFLAGS) \
|
||||
$(GLIB_CFLAGS)
|
||||
$(NULL)
|
||||
|
||||
src_devices_team_libnm_device_plugin_team_la_LDFLAGS = \
|
||||
-module -avoid-version \
|
||||
|
|
@ -2928,18 +2828,9 @@ src_devices_ovs_libnm_device_plugin_ovs_la_SOURCES = \
|
|||
src/devices/ovs/nm-device-ovs-bridge.h
|
||||
|
||||
src_devices_ovs_libnm_device_plugin_ovs_la_CPPFLAGS = \
|
||||
-I$(srcdir)/src \
|
||||
-I$(builddir)/src \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(builddir)/libnm-core \
|
||||
-I$(srcdir)/libnm-core \
|
||||
\
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_DAEMON \
|
||||
-DRUNSTATEDIR=\"$(runstatedir)\" \
|
||||
\
|
||||
$(src_cppflags_device_plugin) \
|
||||
$(JANSSON_CFLAGS) \
|
||||
$(GLIB_CFLAGS)
|
||||
$(NULL)
|
||||
|
||||
src_devices_ovs_libnm_device_plugin_ovs_la_LDFLAGS = \
|
||||
-module -avoid-version \
|
||||
|
|
@ -2965,9 +2856,7 @@ EXTRA_DIST += \
|
|||
|
||||
check_programs += src/dnsmasq/tests/test-dnsmasq-utils
|
||||
|
||||
src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = \
|
||||
$(src_tests_cppflags) \
|
||||
$(NULL)
|
||||
src_dnsmasq_tests_test_dnsmasq_utils_CPPFLAGS = $(src_cppflags_test)
|
||||
|
||||
src_dnsmasq_tests_test_dnsmasq_utils_LDADD = \
|
||||
src/libNetworkManagerTest.la
|
||||
|
|
@ -3008,7 +2897,7 @@ check_programs += \
|
|||
src/platform/tests/test-cleanup-fake \
|
||||
src/platform/tests/test-cleanup-linux
|
||||
|
||||
src_platform_tests_monitor_CPPFLAGS = $(src_tests_cppflags)
|
||||
src_platform_tests_monitor_CPPFLAGS = $(src_cppflags_test)
|
||||
src_platform_tests_monitor_LDFLAGS = $(src_platform_tests_ldflags)
|
||||
src_platform_tests_monitor_LDADD = $(src_platform_tests_libadd)
|
||||
|
||||
|
|
@ -3052,11 +2941,11 @@ src_platform_tests_test_cleanup_linux_CPPFLAGS = $(src_tests_cppflags_linux)
|
|||
src_platform_tests_test_cleanup_linux_LDFLAGS = $(src_platform_tests_ldflags)
|
||||
src_platform_tests_test_cleanup_linux_LDADD = $(src_platform_tests_libadd)
|
||||
|
||||
src_platform_tests_test_nmp_object_CPPFLAGS = $(src_tests_cppflags)
|
||||
src_platform_tests_test_nmp_object_CPPFLAGS = $(src_cppflags_test)
|
||||
src_platform_tests_test_nmp_object_LDFLAGS = $(src_platform_tests_ldflags)
|
||||
src_platform_tests_test_nmp_object_LDADD = src/libNetworkManagerTest.la
|
||||
|
||||
src_platform_tests_test_general_CPPFLAGS = $(src_tests_cppflags)
|
||||
src_platform_tests_test_general_CPPFLAGS = $(src_cppflags_test)
|
||||
src_platform_tests_test_general_LDFLAGS = $(src_platform_tests_ldflags)
|
||||
src_platform_tests_test_general_LDADD = src/libNetworkManagerTest.la
|
||||
|
||||
|
|
@ -3087,12 +2976,12 @@ check_programs += \
|
|||
src/devices/tests/test-lldp \
|
||||
src/devices/tests/test-acd
|
||||
|
||||
src_devices_tests_test_lldp_CPPFLAGS = $(src_tests_cppflags)
|
||||
src_devices_tests_test_lldp_CPPFLAGS = $(src_cppflags_test)
|
||||
src_devices_tests_test_lldp_LDFLAGS = $(src_devices_tests_ldflags)
|
||||
src_devices_tests_test_lldp_LDADD = \
|
||||
src/libNetworkManagerTest.la
|
||||
|
||||
src_devices_tests_test_acd_CPPFLAGS = $(src_tests_cppflags)
|
||||
src_devices_tests_test_acd_CPPFLAGS = $(src_cppflags_test)
|
||||
src_devices_tests_test_acd_LDFLAGS = $(src_devices_tests_ldflags)
|
||||
src_devices_tests_test_acd_LDADD = \
|
||||
src/libNetworkManagerTest.la
|
||||
|
|
@ -3118,11 +3007,11 @@ src_ndisc_tests_ldadd = \
|
|||
check_programs += src/ndisc/tests/test-ndisc-fake
|
||||
check_programs_norun += src/ndisc/tests/test-ndisc-linux
|
||||
|
||||
src_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_tests_cppflags)
|
||||
src_ndisc_tests_test_ndisc_linux_CPPFLAGS = $(src_cppflags_test)
|
||||
src_ndisc_tests_test_ndisc_linux_LDFLAGS = $(src_ndisc_tests_ldflags)
|
||||
src_ndisc_tests_test_ndisc_linux_LDADD = $(src_ndisc_tests_ldadd)
|
||||
|
||||
src_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_tests_cppflags)
|
||||
src_ndisc_tests_test_ndisc_fake_CPPFLAGS = $(src_cppflags_test)
|
||||
src_ndisc_tests_test_ndisc_fake_LDFLAGS = $(src_ndisc_tests_ldflags)
|
||||
src_ndisc_tests_test_ndisc_fake_LDADD = $(src_ndisc_tests_ldadd)
|
||||
|
||||
|
|
@ -3138,10 +3027,7 @@ EXTRA_DIST += \
|
|||
|
||||
check_programs += src/supplicant/tests/test-supplicant-config
|
||||
|
||||
src_supplicant_tests_test_supplicant_config_CPPFLAGS = \
|
||||
$(src_tests_cppflags) \
|
||||
$(nm_build_cflags) \
|
||||
$(NULL)
|
||||
src_supplicant_tests_test_supplicant_config_CPPFLAGS = $(src_cppflags_test)
|
||||
|
||||
src_supplicant_tests_test_supplicant_config_LDADD = \
|
||||
src/libNetworkManagerTest.la
|
||||
|
|
@ -3167,10 +3053,7 @@ src_tests_config_test_config_SOURCES = \
|
|||
src/tests/config/nm-test-device.h \
|
||||
src/tests/config/test-config.c
|
||||
|
||||
src_tests_config_test_config_CPPFLAGS = \
|
||||
$(src_tests_cppflags) \
|
||||
$(nm_build_cflags) \
|
||||
$(NULL)
|
||||
src_tests_config_test_config_CPPFLAGS = $(src_cppflags_test)
|
||||
|
||||
src_tests_config_test_config_LDADD = \
|
||||
src/libNetworkManagerTest.la
|
||||
|
|
@ -3212,31 +3095,31 @@ check_programs += \
|
|||
src/tests/test-wired-defname \
|
||||
src/tests/test-utils
|
||||
|
||||
src_tests_test_ip4_config_CPPFLAGS = $(src_tests_cppflags)
|
||||
src_tests_test_ip4_config_CPPFLAGS = $(src_cppflags_test)
|
||||
src_tests_test_ip4_config_LDFLAGS = $(src_tests_ldflags)
|
||||
src_tests_test_ip4_config_LDADD = $(src_tests_ldadd)
|
||||
|
||||
src_tests_test_ip6_config_CPPFLAGS = $(src_tests_cppflags)
|
||||
src_tests_test_ip6_config_CPPFLAGS = $(src_cppflags_test)
|
||||
src_tests_test_ip6_config_LDFLAGS = $(src_tests_ldflags)
|
||||
src_tests_test_ip6_config_LDADD = $(src_tests_ldadd)
|
||||
|
||||
src_tests_test_dcb_CPPFLAGS = $(src_tests_cppflags)
|
||||
src_tests_test_dcb_CPPFLAGS = $(src_cppflags_test)
|
||||
src_tests_test_dcb_LDFLAGS = $(src_tests_ldflags)
|
||||
src_tests_test_dcb_LDADD = $(src_tests_ldadd)
|
||||
|
||||
src_tests_test_general_CPPFLAGS = $(src_tests_cppflags)
|
||||
src_tests_test_general_CPPFLAGS = $(src_cppflags_test)
|
||||
src_tests_test_general_LDFLAGS = $(src_tests_ldflags)
|
||||
src_tests_test_general_LDADD = $(src_tests_ldadd)
|
||||
|
||||
src_tests_test_general_with_expect_CPPFLAGS = $(src_tests_cppflags)
|
||||
src_tests_test_general_with_expect_CPPFLAGS = $(src_cppflags_test)
|
||||
src_tests_test_general_with_expect_LDFLAGS = $(src_tests_ldflags)
|
||||
src_tests_test_general_with_expect_LDADD = $(src_tests_ldadd)
|
||||
|
||||
src_tests_test_wired_defname_CPPFLAGS = $(src_tests_cppflags)
|
||||
src_tests_test_wired_defname_CPPFLAGS = $(src_cppflags_test)
|
||||
src_tests_test_wired_defname_LDFLAGS = $(src_tests_ldflags)
|
||||
src_tests_test_wired_defname_LDADD = $(src_tests_ldadd)
|
||||
|
||||
src_tests_test_utils_CPPFLAGS = $(src_tests_cppflags)
|
||||
src_tests_test_utils_CPPFLAGS = $(src_cppflags_test)
|
||||
src_tests_test_utils_LDFLAGS = $(src_tests_ldflags)
|
||||
src_tests_test_utils_LDADD = $(src_tests_ldadd)
|
||||
|
||||
|
|
@ -3275,6 +3158,7 @@ noinst_LTLIBRARIES += \
|
|||
dispatcher/libnm-dispatcher-core.la
|
||||
|
||||
dispatcher_cppflags = \
|
||||
$(dflt_cppflags) \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-core \
|
||||
|
|
@ -3286,9 +3170,7 @@ dispatcher_cppflags = \
|
|||
$(GLIB_CFLAGS) \
|
||||
-DG_LOG_DOMAIN=\""nm-dispatcher"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
||||
-DNMCONFDIR=\"$(nmconfdir)\" \
|
||||
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||
-DLIBEXECDIR=\"$(libexecdir)\"
|
||||
$(NULL)
|
||||
|
||||
|
||||
dispatcher_nmdbus_dispatcher_sources = \
|
||||
|
|
@ -3374,6 +3256,7 @@ EXTRA_DIST += \
|
|||
check_programs += dispatcher/tests/test-dispatcher-envp
|
||||
|
||||
dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
|
||||
$(dflt_cppflags) \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-core \
|
||||
|
|
@ -3381,8 +3264,6 @@ dispatcher_tests_test_dispatcher_envp_CPPFLAGS = \
|
|||
-I$(srcdir)/libnm \
|
||||
-I$(builddir)/libnm \
|
||||
-I$(srcdir)/dispatcher \
|
||||
-I$(builddir)/dispatcher \
|
||||
$(nm_build_cflags) \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
||||
$(GLIB_CFLAGS) \
|
||||
|
|
@ -3416,6 +3297,7 @@ EXTRA_DIST += \
|
|||
bin_PROGRAMS += clients/nm-online
|
||||
|
||||
clients_nm_online_CPPFLAGS = \
|
||||
$(dflt_cppflags) \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-core \
|
||||
|
|
@ -3425,7 +3307,7 @@ clients_nm_online_CPPFLAGS = \
|
|||
$(GLIB_CFLAGS) \
|
||||
-DG_LOG_DOMAIN=\""nm-online"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
||||
-DNMLOCALEDIR=\"$(nmlocaledir)\"
|
||||
$(NULL)
|
||||
|
||||
clients_nm_online_LDFLAGS = \
|
||||
-Wl,--version-script="$(srcdir)/linker-script-binary.ver"
|
||||
|
|
@ -3444,6 +3326,7 @@ EXTRA_DIST += \
|
|||
###############################################################################
|
||||
|
||||
clients_cppflags = \
|
||||
$(dflt_cppflags) \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-core \
|
||||
|
|
@ -3452,8 +3335,9 @@ clients_cppflags = \
|
|||
-I$(builddir)/libnm \
|
||||
-I$(srcdir)/clients/common \
|
||||
-I$(builddir)/clients/common \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
||||
$(GLIB_CFLAGS) \
|
||||
-DNMLOCALEDIR=\"$(nmlocaledir)\" \
|
||||
$(SANITIZER_EXEC_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
check_ltlibraries += clients/common/libnmc-base.la
|
||||
|
|
@ -3478,7 +3362,7 @@ clients_common_libnmc_base_la_SOURCES = \
|
|||
clients_common_libnmc_base_la_CPPFLAGS = \
|
||||
$(clients_cppflags) \
|
||||
-DG_LOG_DOMAIN=\""libnmc"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT
|
||||
$(NULL)
|
||||
|
||||
clients_common_libnmc_base_la_LIBADD = \
|
||||
libnm/libnm.la \
|
||||
|
|
@ -3535,7 +3419,7 @@ clients_common_libnmc_la_SOURCES = \
|
|||
clients_common_libnmc_la_CPPFLAGS = \
|
||||
$(clients_cppflags) \
|
||||
-DG_LOG_DOMAIN=\""libnmc"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT
|
||||
$(NULL)
|
||||
|
||||
clients_common_libnmc_la_LIBADD = \
|
||||
libnm/libnm.la \
|
||||
|
|
@ -3558,8 +3442,7 @@ clients_common_tests_test_general_CPPFLAGS = \
|
|||
-I$(srcdir)/clients/common/tests \
|
||||
$(clients_cppflags) \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
||||
$(SANITIZER_EXEC_CFLAGS)
|
||||
$(NULL)
|
||||
|
||||
clients_common_tests_test_general_LDFLAGS = \
|
||||
$(SANITIZER_EXEC_LDFLAGS)
|
||||
|
|
@ -3604,11 +3487,8 @@ clients_cli_nmcli_SOURCES = \
|
|||
clients_cli_nmcli_CPPFLAGS = \
|
||||
-I$(srcdir)/clients/cli \
|
||||
$(clients_cppflags) \
|
||||
$(SANITIZER_EXEC_CFLAGS) \
|
||||
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||
-DG_LOG_DOMAIN=\""nmcli"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
||||
-DNMLOCALEDIR=\"$(nmlocaledir)\"
|
||||
$(NULL)
|
||||
|
||||
clients_cli_nmcli_LDADD = \
|
||||
libnm/libnm.la \
|
||||
|
|
@ -3706,17 +3586,9 @@ clients_tui_newt_libnmt_newt_a_SOURCES = \
|
|||
$(NULL)
|
||||
|
||||
clients_tui_newt_libnmt_newt_a_CPPFLAGS = \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-core \
|
||||
-I$(builddir)/libnm-core \
|
||||
-I$(srcdir)/libnm \
|
||||
-I$(builddir)/libnm \
|
||||
$(clients_cppflags) \
|
||||
-DG_LOG_DOMAIN=\""nmtui"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(NEWT_CFLAGS) \
|
||||
$(SANITIZER_EXEC_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
$(clients_tui_newt_libnmt_newt_a_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
|
||||
|
|
@ -3811,10 +3683,9 @@ clients_tui_nmtui_SOURCES = \
|
|||
clients_tui_nmtui_CPPFLAGS = \
|
||||
-I$(srcdir)/clients/tui/newt \
|
||||
$(clients_cppflags) \
|
||||
$(NEWT_CFLAGS) \
|
||||
-DG_LOG_DOMAIN=\""nmtui"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT \
|
||||
-DNMLOCALEDIR=\""$(nmlocaledir)"\"
|
||||
$(NEWT_CFLAGS) \
|
||||
$(NULL)
|
||||
|
||||
clients_tui_nmtui_LDFLAGS = \
|
||||
-Wl,--version-script="$(srcdir)/linker-script-binary.ver" \
|
||||
|
|
@ -3969,13 +3840,13 @@ lib_LTLIBRARIES += libnm-util/libnm-util.la
|
|||
libnm_util_libnm_util_includedir=$(includedir)/NetworkManager
|
||||
|
||||
libnm_util_cppflags = \
|
||||
$(dflt_cppflags) \
|
||||
-I$(srcdir)/libnm-util \
|
||||
-I$(builddir)/libnm-util \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-DG_LOG_DOMAIN=\""libnm-util"\" \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \
|
||||
-DNMLOCALEDIR=\"$(nmlocaledir)\" \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(DBUS_CFLAGS) \
|
||||
$(UUID_CFLAGS)
|
||||
|
|
@ -4181,13 +4052,13 @@ dist_dependencies += libnm-util/libnm-util.la
|
|||
###############################################################################
|
||||
|
||||
libnm_util_tests_cppflags = \
|
||||
$(dflt_cppflags) \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-util \
|
||||
-I$(builddir)/libnm-util \
|
||||
$(GLIB_CFLAGS) \
|
||||
$(DBUS_CFLAGS) \
|
||||
$(nm_build_cflags) \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL \
|
||||
$(SANITIZER_EXEC_CFLAGS) \
|
||||
|
|
@ -4261,6 +4132,7 @@ EXTRA_DIST += \
|
|||
###############################################################################
|
||||
|
||||
libnm_glib_cppflags = \
|
||||
$(dflt_cppflags) \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-util \
|
||||
|
|
@ -4539,12 +4411,12 @@ dist_dependencies += \
|
|||
###############################################################################
|
||||
|
||||
libnm_glib_tests_cppflags = \
|
||||
$(dflt_cppflags) \
|
||||
-I$(srcdir)/shared \
|
||||
-I$(builddir)/shared \
|
||||
-I$(srcdir)/libnm-util \
|
||||
-I$(builddir)/libnm-util \
|
||||
-I$(srcdir)/libnm-glib \
|
||||
$(nm_build_cflags) \
|
||||
-DNETWORKMANAGER_COMPILATION_TEST \
|
||||
-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_GLIB \
|
||||
$(GLIB_CFLAGS) \
|
||||
|
|
|
|||
|
|
@ -27,9 +27,7 @@ deps = [
|
|||
]
|
||||
|
||||
cflags = clients_cflags + [
|
||||
'-DSYSCONFDIR="@0@"'.format(nm_sysconfdir),
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(name),
|
||||
'-DNMLOCALEDIR="@0@"'.format(nm_localedir)
|
||||
]
|
||||
|
||||
if enable_polkit_agent
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ deps = [
|
|||
|
||||
clients_cflags = [
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
|
||||
'-DNMLOCALEDIR="@0@"'.format(nm_localedir),
|
||||
]
|
||||
|
||||
cflags = clients_cflags + [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,6 @@ deps = [
|
|||
|
||||
cflags = clients_cflags + [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(name),
|
||||
'-DNMLOCALEDIR="@0@"'.format(nm_localedir)
|
||||
]
|
||||
|
||||
subdir('newt')
|
||||
|
|
|
|||
21
config-extra.h.meson
Normal file
21
config-extra.h.meson
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
#mesondefine BINDIR
|
||||
#mesondefine DATADIR
|
||||
#mesondefine DHCLIENT_PATH
|
||||
#mesondefine DHCPCANON_PATH
|
||||
#mesondefine DHCPCD_PATH
|
||||
#mesondefine LIBEXECDIR
|
||||
#mesondefine LOCALSTATEDIR
|
||||
#mesondefine NMCONFDIR
|
||||
#mesondefine NMLIBDIR
|
||||
#mesondefine NMLOCALEDIR
|
||||
#mesondefine NMPLUGINDIR
|
||||
#mesondefine NMRUNDIR
|
||||
#mesondefine NMSTATEDIR
|
||||
#mesondefine NMVPNDIR
|
||||
#mesondefine NM_BUILD_BUILDDIR
|
||||
#mesondefine NM_BUILD_SRCDIR
|
||||
#mesondefine PPPD_PLUGIN_DIR
|
||||
#mesondefine PREFIX
|
||||
#mesondefine RUNDIR
|
||||
#mesondefine RUNSTATEDIR
|
||||
#mesondefine SYSCONFDIR
|
||||
|
|
@ -135,6 +135,14 @@ Conflicts: NetworkManager-pptp < 1:0.7.0.99-1
|
|||
Conflicts: NetworkManager-openconnect < 0:0.7.0.99-1
|
||||
Conflicts: kde-plasma-networkmanagement < 1:0.9-0.49.20110527git.nm09
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: libtool
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: automake
|
||||
BuildRequires: autoconf
|
||||
BuildRequires: intltool
|
||||
BuildRequires: gettext-devel
|
||||
|
||||
BuildRequires: dbus-devel >= %{dbus_version}
|
||||
BuildRequires: dbus-glib-devel >= %{dbus_glib_version}
|
||||
%if 0%{?fedora}
|
||||
|
|
@ -142,9 +150,6 @@ BuildRequires: wireless-tools-devel >= %{wireless_tools_version}
|
|||
%endif
|
||||
BuildRequires: glib2-devel >= 2.40.0
|
||||
BuildRequires: gobject-introspection-devel >= 0.10.3
|
||||
BuildRequires: gettext-devel
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: automake autoconf intltool libtool
|
||||
%if %{with ppp}
|
||||
BuildRequires: ppp-devel >= 2.4.5
|
||||
%endif
|
||||
|
|
|
|||
|
|
@ -31,9 +31,6 @@ deps = [
|
|||
]
|
||||
|
||||
cflags = [
|
||||
'-DLIBEXECDIR="@0@"'.format(nm_libexecdir),
|
||||
'-DSYSCONFDIR="@0@"'.format(nm_sysconfdir),
|
||||
'-DNMCONFDIR="@0@"'.format(nm_pkgconfdir),
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(name),
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
|
||||
]
|
||||
|
|
|
|||
|
|
@ -13,8 +13,7 @@ exe = executable(
|
|||
c_args: [
|
||||
'-DNETWORKMANAGER_COMPILATION_TEST',
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_CLIENT',
|
||||
] +
|
||||
nm_build_cflags,
|
||||
],
|
||||
link_with: libnm_dispatcher_core
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -144,12 +144,6 @@ deps = [
|
|||
cflags = [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(libnm_name),
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
|
||||
'-DLIBEXECDIR="@0@"'.format(nm_libexecdir),
|
||||
'-DNMLOCALEDIR="@0@"'.format(nm_localedir),
|
||||
'-DNMCONFDIR="@0@"'.format(nm_pkgconfdir),
|
||||
'-DNMLIBDIR="@0@"'.format(nm_pkglibdir),
|
||||
'-DNMPLUGINDIR="@0@"'.format(nm_plugindir),
|
||||
'-DNMVPNDIR="@0@"'.format(nm_vpndir)
|
||||
]
|
||||
|
||||
if enable_json_validation
|
||||
|
|
|
|||
|
|
@ -37,8 +37,7 @@ foreach test_unit: test_units
|
|||
c_args: [
|
||||
'-DNETWORKMANAGER_COMPILATION_TEST',
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE',
|
||||
] +
|
||||
nm_build_cflags,
|
||||
],
|
||||
link_with: libnm_core
|
||||
)
|
||||
test(
|
||||
|
|
|
|||
|
|
@ -19,8 +19,7 @@ foreach test_unit: test_units
|
|||
c_args:
|
||||
common_cflags + [
|
||||
'-DNETWORKMANAGER_COMPILATION_TEST',
|
||||
] +
|
||||
nm_build_cflags,
|
||||
],
|
||||
)
|
||||
|
||||
test(
|
||||
|
|
|
|||
|
|
@ -102,7 +102,6 @@ deps = [
|
|||
|
||||
common_cflags = [
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_UTIL',
|
||||
'-DNMLOCALEDIR="@0@"'.format(nm_localedir),
|
||||
]
|
||||
|
||||
cflags = common_cflags + [
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ deps = [
|
|||
|
||||
cflags = common_cflags + [
|
||||
'-DNETWORKMANAGER_COMPILATION_TEST',
|
||||
] + nm_build_cflags
|
||||
]
|
||||
|
||||
test = 'test-libnm-linking'
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ test_units = [
|
|||
cflags = [
|
||||
'-DNETWORKMANAGER_COMPILATION_TEST',
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM',
|
||||
] + nm_build_cflags
|
||||
]
|
||||
|
||||
foreach test_unit: test_units
|
||||
exe = executable(
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
|
|||
dnl attach it to the CFLAGS.
|
||||
NM_COMPILER_WARNING([$1], [unknown-warning-option], [])
|
||||
|
||||
CFLAGS_MORE_WARNINGS="-Wall -std=gnu99"
|
||||
CFLAGS_MORE_WARNINGS="-Wall"
|
||||
|
||||
if test "x$set_more_warnings" = xerror; then
|
||||
CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS -Werror"
|
||||
|
|
@ -92,7 +92,7 @@ if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
|
|||
-Wno-unused-parameter \
|
||||
; do
|
||||
dnl GCC 4.4 does not warn when checking for -Wno-* flags (https://gcc.gnu.org/wiki/FAQ#wnowarning)
|
||||
_NM_COMPILER_FLAG([$(printf '%s' "$option" | sed 's/^-Wno-/-W/')], [],
|
||||
_NM_COMPILER_FLAG([$(printf '%s' "$option" | sed 's/^-Wno-/-W/')], [],
|
||||
[CFLAGS_MORE_WARNINGS="$CFLAGS_MORE_WARNINGS $option"], [])
|
||||
done
|
||||
unset option
|
||||
|
|
|
|||
43
meson.build
43
meson.build
|
|
@ -54,11 +54,6 @@ nm_pkgstatedir = join_paths(nm_localstatedir, nm_name)
|
|||
nm_vpndir = join_paths(nm_libdir, nm_name)
|
||||
nm_plugindir = join_paths(nm_libdir, nm_name, dist_version)
|
||||
|
||||
nm_build_cflags = [
|
||||
'-DNM_BUILD_SRCDIR="@0@"'.format(meson.source_root()),
|
||||
'-DNM_BUILD_BUILDDIR="@0@"'.format(meson.build_root()),
|
||||
]
|
||||
|
||||
libnm_name = 'libnm'
|
||||
|
||||
current = 1
|
||||
|
|
@ -874,6 +869,44 @@ configure_file(
|
|||
configuration: config_h
|
||||
)
|
||||
|
||||
config_extra_h = configuration_data()
|
||||
|
||||
config_extra_h.set_quoted('BINDIR', nm_bindir)
|
||||
config_extra_h.set_quoted('DATADIR', nm_datadir)
|
||||
if enable_dhclient
|
||||
config_extra_h.set_quoted('DHCLIENT_PATH', dhclient.path())
|
||||
endif
|
||||
if enable_dhcpcanon
|
||||
config_extra_h.set_quoted('DHCPCANON_PATH', dhcpcanon.path())
|
||||
endif
|
||||
if enable_dhcpcd
|
||||
config_extra_h.set_quoted('DHCPCD_PATH', dhcpcd.path())
|
||||
endif
|
||||
config_extra_h.set_quoted('LIBEXECDIR', nm_libexecdir)
|
||||
config_extra_h.set_quoted('LOCALSTATEDIR', nm_localstatedir)
|
||||
config_extra_h.set_quoted('NMCONFDIR', nm_pkgconfdir)
|
||||
config_extra_h.set_quoted('NMLIBDIR', nm_pkglibdir)
|
||||
config_extra_h.set_quoted('NMLIBDIR', nm_pkglibdir)
|
||||
config_extra_h.set_quoted('NMLOCALEDIR', nm_localedir)
|
||||
config_extra_h.set_quoted('NMPLUGINDIR', nm_plugindir)
|
||||
config_extra_h.set_quoted('NMRUNDIR', nm_pkgrundir)
|
||||
config_extra_h.set_quoted('NMSTATEDIR', nm_pkgstatedir)
|
||||
config_extra_h.set_quoted('NMVPNDIR', nm_vpndir)
|
||||
config_extra_h.set_quoted('NM_BUILD_BUILDDIR', meson.build_root())
|
||||
config_extra_h.set_quoted('NM_BUILD_SRCDIR', meson.source_root())
|
||||
config_extra_h.set_quoted('PPPD_PLUGIN_DIR', pppd_plugin_dir)
|
||||
config_extra_h.set_quoted('PREFIX', nm_prefix)
|
||||
config_extra_h.set_quoted('RUNDIR', nm_pkgrundir)
|
||||
config_extra_h.set_quoted('RUNSTATEDIR', nm_runstatedir)
|
||||
config_extra_h.set_quoted('SBINDIR', nm_sbindir)
|
||||
config_extra_h.set_quoted('SYSCONFDIR', nm_sysconfdir)
|
||||
|
||||
configure_file(
|
||||
input: 'config-extra.h.meson',
|
||||
output: 'config-extra.h',
|
||||
configuration: config_extra_h
|
||||
)
|
||||
|
||||
meson.add_install_script(
|
||||
'meson_post_install.py',
|
||||
nm_datadir,
|
||||
|
|
|
|||
|
|
@ -112,6 +112,8 @@
|
|||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include "config-extra.h"
|
||||
|
||||
/* for internal compilation we don't want the deprecation macros
|
||||
* to be in effect. Define the widest range of versions to effectively
|
||||
* disable deprecation checks */
|
||||
|
|
|
|||
|
|
@ -15,7 +15,6 @@ libnm_device_plugin_ovs = shared_module(
|
|||
'nm-device-plugin-ovs',
|
||||
sources: sources,
|
||||
dependencies: deps,
|
||||
c_args: '-DRUNSTATEDIR="@0@"'.format(nm_runstatedir),
|
||||
link_args: ldflags_linker_script_devices,
|
||||
link_depends: linker_script_devices,
|
||||
install: true,
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ name = 'nm-dhcp-helper'
|
|||
cflags = [
|
||||
'-DG_LOG_DOMAIN="@0@"'.format(name),
|
||||
'-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_GLIB',
|
||||
'-DNMRUNDIR="@0@"'.format(nm_pkgrundir),
|
||||
]
|
||||
|
||||
executable(
|
||||
|
|
|
|||
|
|
@ -8,7 +8,6 @@ foreach test_unit: test_units
|
|||
test_unit,
|
||||
test_unit + '.c',
|
||||
dependencies: test_nm_dep,
|
||||
c_args: nm_build_cflags,
|
||||
)
|
||||
|
||||
test(
|
||||
|
|
|
|||
|
|
@ -17,35 +17,7 @@ nm_dep = declare_dependency(
|
|||
compile_args: nm_cflags
|
||||
)
|
||||
|
||||
cflags = nm_cflags + [
|
||||
'-DPREFIX="@0@"'.format(nm_prefix),
|
||||
'-DBINDIR="@0@"'.format(nm_bindir),
|
||||
'-DDATADIR="@0@"'.format(nm_datadir),
|
||||
'-DLIBEXECDIR="@0@"'.format(nm_libexecdir),
|
||||
'-DLOCALSTATEDIR="@0@"'.format(nm_localstatedir),
|
||||
'-DRUNSTATEDIR="@0@"'.format(nm_runstatedir),
|
||||
'-DSBINDIR="@0@"'.format(nm_sbindir),
|
||||
'-DSYSCONFDIR="@0@"'.format(nm_sysconfdir),
|
||||
'-DRUNDIR="@0@"'.format(nm_pkgrundir),
|
||||
'-DNMCONFDIR="@0@"'.format(nm_pkgconfdir),
|
||||
'-DNMLOCALEDIR="@0@"'.format(nm_localedir),
|
||||
'-DNMPLUGINDIR="@0@"'.format(nm_plugindir),
|
||||
'-DNMRUNDIR="@0@"'.format(nm_pkgrundir),
|
||||
'-DNMSTATEDIR="@0@"'.format(nm_pkgstatedir),
|
||||
'-DNMLIBDIR="@0@"'.format(nm_pkglibdir)
|
||||
]
|
||||
|
||||
if enable_dhcpcanon
|
||||
cflags += '-DDHCPCANON_PATH="@0@"'.format(dhcpcanon.path())
|
||||
endif
|
||||
|
||||
if enable_dhclient
|
||||
cflags += '-DDHCLIENT_PATH="@0@"'.format(dhclient.path())
|
||||
endif
|
||||
|
||||
if enable_dhcpcd
|
||||
cflags += '-DDHCPCD_PATH="@0@"'.format(dhcpcd.path())
|
||||
endif
|
||||
cflags = nm_cflags
|
||||
|
||||
sources = files(
|
||||
'dhcp/nm-dhcp-client.c',
|
||||
|
|
|
|||
|
|
@ -48,8 +48,7 @@
|
|||
#define HOSTNAME_FILE_UCASE_HOSTNAME "/etc/HOSTNAME"
|
||||
#define HOSTNAME_FILE_GENTOO "/etc/conf.d/hostname"
|
||||
|
||||
#define IFCFG_DIR SYSCONFDIR "/sysconfig/network"
|
||||
#define CONF_DHCP IFCFG_DIR "/dhcp"
|
||||
#define CONF_DHCP SYSCONFDIR "/sysconfig/network/dhcp"
|
||||
|
||||
#if (defined(HOSTNAME_PERSIST_SUSE) + defined(HOSTNAME_PERSIST_SLACKWARE) + defined(HOSTNAME_PERSIST_GENTOO)) > 1
|
||||
#error "Can only define one of HOSTNAME_PERSIST_*"
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@ core_plugins += shared_module(
|
|||
name,
|
||||
sources: 'nm-ppp-manager.c',
|
||||
dependencies: deps,
|
||||
c_args: '-DPPPD_PLUGIN_DIR="@0@"'.format(pppd_plugin_dir),
|
||||
link_args: [
|
||||
'-Wl,--version-script,@0@'.format(linker_script),
|
||||
],
|
||||
|
|
|
|||
|
|
@ -1,15 +1,9 @@
|
|||
name = 'nm-settings-plugin-ibft'
|
||||
|
||||
cflags = [
|
||||
'-DSBINDIR="@0@"'.format(nm_sbindir),
|
||||
'-DSYSCONFDIR="@0@"'.format(nm_sysconfdir)
|
||||
]
|
||||
|
||||
libnms_ibft_core = static_library(
|
||||
'nms-ibft-core',
|
||||
'nms-ibft-reader.c',
|
||||
dependencies: nm_dep,
|
||||
c_args: cflags
|
||||
)
|
||||
|
||||
sources = files(
|
||||
|
|
@ -21,7 +15,6 @@ libnm_settings_plugin_ibft = shared_module(
|
|||
name,
|
||||
sources: sources,
|
||||
dependencies: nm_dep,
|
||||
c_args: cflags,
|
||||
link_with: libnms_ibft_core,
|
||||
link_args: ldflags_linker_script_settings,
|
||||
link_depends: linker_script_settings,
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ exe = executable(
|
|||
test_unit,
|
||||
test_unit + '.c',
|
||||
dependencies: test_nm_dep,
|
||||
c_args: nm_build_cflags,
|
||||
link_with: libnms_ibft_core
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -3,11 +3,6 @@ install_data(
|
|||
install_dir: dbus_conf_dir
|
||||
)
|
||||
|
||||
cflags = [
|
||||
'-DSBINDIR="@0@"'.format(nm_sbindir),
|
||||
'-DSYSCONFDIR="@0@"'.format(nm_sysconfdir)
|
||||
]
|
||||
|
||||
name = 'nmdbus-ifcfg-rh'
|
||||
|
||||
dbus_sources = gnome.gdbus_codegen(
|
||||
|
|
@ -21,7 +16,6 @@ libnmdbus_ifcfg_rh = static_library(
|
|||
name,
|
||||
sources: dbus_sources,
|
||||
dependencies: glib_dep,
|
||||
c_args: cflags
|
||||
)
|
||||
|
||||
sources = files(
|
||||
|
|
@ -41,7 +35,6 @@ libnms_ifcfg_rh_core = static_library(
|
|||
'nms-ifcfg-rh-core',
|
||||
sources: sources,
|
||||
dependencies: deps,
|
||||
c_args: cflags
|
||||
)
|
||||
|
||||
sources = [dbus_sources] + files('nms-ifcfg-rh-connection.c')
|
||||
|
|
@ -50,7 +43,6 @@ libnm_settings_plugin_ifcfg_rh = shared_module(
|
|||
'nm-settings-plugin-ifcfg-rh',
|
||||
sources: sources,
|
||||
dependencies: deps,
|
||||
c_args: cflags,
|
||||
link_with: [libnms_ifcfg_rh_core],
|
||||
link_args: ldflags_linker_script_settings,
|
||||
link_depends: linker_script_settings,
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ exe = executable(
|
|||
test_unit,
|
||||
test_unit + '.c',
|
||||
dependencies: test_nm_dep,
|
||||
c_args: nm_build_cflags,
|
||||
link_with: libnms_ifcfg_rh_core
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -8,13 +8,10 @@ deps = [
|
|||
nm_dep
|
||||
]
|
||||
|
||||
cflags = '-DSYSCONFDIR="@0@"'.format(nm_sysconfdir)
|
||||
|
||||
libnms_ifupdown_core = static_library(
|
||||
'nms-ifupdown-core',
|
||||
sources: sources,
|
||||
dependencies: deps,
|
||||
c_args: cflags
|
||||
)
|
||||
|
||||
sources = files(
|
||||
|
|
@ -26,7 +23,6 @@ libnm_settings_plugin_ifupdown = shared_module(
|
|||
'nm-settings-plugin-ifupdown',
|
||||
sources: sources,
|
||||
dependencies: deps,
|
||||
c_args: cflags,
|
||||
link_with: libnms_ifupdown_core,
|
||||
link_args: ldflags_linker_script_settings,
|
||||
link_depends: linker_script_settings,
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ exe = executable(
|
|||
test_unit,
|
||||
test_unit + '.c',
|
||||
dependencies: test_nm_dep,
|
||||
c_args: nm_build_cflags,
|
||||
link_with: libnms_ifupdown_core
|
||||
)
|
||||
|
||||
|
|
|
|||
|
|
@ -6,7 +6,6 @@ exe = executable(
|
|||
test_unit,
|
||||
test_unit + '.c',
|
||||
dependencies: test_nm_dep,
|
||||
c_args: nm_build_cflags,
|
||||
)
|
||||
|
||||
test(
|
||||
|
|
|
|||
|
|
@ -4,7 +4,6 @@ exe = executable(
|
|||
test_unit,
|
||||
test_unit + '.c',
|
||||
dependencies: test_nm_dep,
|
||||
c_args: nm_build_cflags,
|
||||
)
|
||||
|
||||
test(
|
||||
|
|
|
|||
|
|
@ -419,7 +419,7 @@ static inline unsigned long ALIGN_POWER2(unsigned long u) {
|
|||
* Don't break on glibc < 2.16 that doesn't define __STDC_NO_THREADS__
|
||||
* see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=53769
|
||||
*/
|
||||
#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L && !(defined(__STDC_NO_THREADS__) || (defined(__GNU_LIBRARY__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 16))
|
||||
#if __STDC_VERSION__ >= 201112L && !(defined(__STDC_NO_THREADS__) || (defined(__GNU_LIBRARY__) && __GLIBC__ == 2 && __GLIBC_MINOR__ < 16))
|
||||
#define thread_local _Thread_local
|
||||
#else
|
||||
#define thread_local __thread
|
||||
|
|
|
|||
|
|
@ -11,7 +11,6 @@ exe = executable(
|
|||
test_unit,
|
||||
sources,
|
||||
dependencies: test_nm_dep,
|
||||
c_args: nm_build_cflags,
|
||||
)
|
||||
|
||||
test(
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue