fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-02 13:08:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

build/meson: merge branch 'meson-fixes'

Browse source 
https://mail.gnome.org/archives/networkmanager-list/2018-January/msg00055.html
This commit is contained in:
Thomas Haller 2018-01-12 09:54:15 +01:00
commit d3dfadf639
10 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -60,7 +60,7 @@ test-*.trs
/dispatcher/tests/test-dispatcher-envp
/clients/cli/nmcli
/clients/common/settings-docs.c
/clients/common/settings-docs.h
/clients/tui/newt/libnmt-newt.a
/clients/tui/nmtui
/clients/nm-online
@ -308,6 +308,7 @@ test-*.trs
/libnm/nm-setting-docs.xml
/libnm/nm-setting-docs-overrides.xml
/clients/cli/settings-docs.c
/clients/common/settings-docs.c
/libnm-core/tests/test-setting-8021x
/libnm-core/tests/test-setting-bond
/libnm-core/tests/test-setting-dcb

22
Makefile.am
View file

@ -3343,27 +3343,27 @@ clients_common_libnmc_base_la_LIBADD = \
$(clients_common_libnmc_base_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(clients_common_libnmc_base_la_OBJECTS): clients/common/.dirstamp
clients_common_settings_doc_c = clients/common/settings-docs.c
clients_common_settings_doc_h = clients/common/settings-docs.h
if HAVE_INTROSPECTION
$(clients_common_settings_doc_c): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp
$(clients_common_settings_doc_h): clients/common/settings-docs.xsl libnm/nm-property-docs.xml clients/common/.dirstamp
$(AM_V_GEN) $(XSLTPROC) --output $@ $< $(word 2,$^)
DISTCLEANFILES += $(clients_common_settings_doc_c)
check-local-settings-docs: $(clients_common_settings_doc_c)
DISTCLEANFILES += $(clients_common_settings_doc_h)
check-local-settings-docs: $(clients_common_settings_doc_h)
@if test -z "$$NMTST_NO_CHECK_SETTINGS_DOCS" ; then \
if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)" ; then \
echo "The generated file \"$(builddir)/$(clients_common_settings_doc_c)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_c).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes"; \
if ! cmp -s "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)" ; then \
echo "The generated file \"$(builddir)/$(clients_common_settings_doc_h)\" differs from the source file \"$(srcdir)/$(clients_common_settings_doc_h).in\". You probably should copy the generated file over to the source file. You can skip this test by setting \$$NMTST_NO_CHECK_SETTINGS_DOCS=yes"; \
false; \
fi;\
fi
check_local += check-local-settings-docs
else
$(clients_common_settings_doc_c): $(clients_common_settings_doc_c).in clients/common/.dirstamp
$(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_c).in" "$(builddir)/$(clients_common_settings_doc_c)"
$(clients_common_settings_doc_h): $(clients_common_settings_doc_h).in clients/common/.dirstamp
$(AM_V_GEN) cp "$(srcdir)/$(clients_common_settings_doc_h).in" "$(builddir)/$(clients_common_settings_doc_h)"
check-local-settings-docs:
endif
EXTRA_DIST += \
$(clients_common_settings_doc_c) \
$(clients_common_settings_doc_c).in
$(clients_common_settings_doc_h) \
$(clients_common_settings_doc_h).in
if HAVE_INTROSPECTION
check_ltlibraries += clients/common/libnmc.la
@ -3392,7 +3392,7 @@ clients_common_libnmc_la_LIBADD = \
$(GLIB_LIBS)
$(clients_common_libnmc_la_OBJECTS): $(libnm_core_lib_h_pub_mkenums)
$(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_c)
$(clients_common_libnmc_la_OBJECTS): $(clients_common_settings_doc_h)
$(clients_common_libnmc_la_OBJECTS): clients/common/.dirstamp
if HAVE_INTROSPECTION

2
clients/common/meson.build
View file

@ -34,7 +34,7 @@ sources = shared_meta_setting + files(
'nm-meta-setting-desc.c'
)
settings_docs = 'settings-docs.c'
settings_docs = 'settings-docs.h'
if enable_introspection
settings_docs_source = custom_target(

2
clients/common/nm-meta-setting-desc.c
View file

@ -4889,7 +4889,7 @@ static const NMMetaPropertyType _pt_gobject_devices = {
/*****************************************************************************/
#include "settings-docs.c"
#include "settings-docs.h"
/*****************************************************************************/

0
clients/common/settings-docs.c.in → clients/common/settings-docs.h.in
View file

2
libnm-glib/meson.build
View file

@ -200,7 +200,7 @@ libnm_glib = shared_library(
c_args: cflags + [
'-DNMRUNDIR="@0@"'.format(nm_pkgrundir),
],
link_with: libdeprecated_nm_glib,
link_whole: libdeprecated_nm_glib,
link_args: [
'-Wl,--version-script,@0@'.format(linker_script),
],

3
meson.build
View file

@ -187,8 +187,7 @@ config_h.set10('WITH_JANSSON', jansson_dep.found())
if jansson_dep.found()
jansson_libdir = jansson_dep.get_pkgconfig_variable('libdir')
readelf = find_program('readelf', 'readelf')
res = run_command(readelf, '-d', join_paths(jansson_libdir, 'libjansson.so'))
res = run_command(find_program('eu-readelf', 'readelf'), '-d', join_paths(jansson_libdir, 'libjansson.so'))
jansson_soname = ''
foreach line: res.stdout().split('\n')
if line.strip().contains('SONAME')

2
meson_options.txt
View file

@ -74,4 +74,4 @@ option('libpsl', type: 'boolean', value: true, description: 'Link against libpsl
option('json_validation', type: 'boolean', value: true, description: 'Enable JSON validation in libnm')
option('crypto', type: 'combo', choices: ['nss', 'gnutls'], value: 'nss', description: 'Cryptography library to use for certificate and key operations')
option('qt', type: 'boolean', value: true, description: 'enable Qt examples')
option('check_settings_docs', type: 'boolean', value: false, description: 'compare check settings-docs.c file')
option('check_settings_docs', type: 'boolean', value: false, description: 'compare check settings-docs.h file')

2
po/POTFILES.in
View file

@ -16,7 +16,7 @@ clients/common/nm-meta-setting-desc.c
clients/common/nm-polkit-listener.c
clients/common/nm-secret-agent-simple.c
clients/common/nm-vpn-helpers.c
clients/common/settings-docs.c.in
clients/common/settings-docs.h.in
clients/nm-online.c
clients/tui/newt/nmt-newt-utils.c
clients/tui/nm-editor-utils.c

3
po/POTFILES.skip
View file

@ -10,3 +10,6 @@ shared/nm-utils/nm-vpn-editor-plugin-call.h
shared/nm-utils/nm-vpn-plugin-utils.c
# https://bugs.launchpad.net/intltool/+bug/1117944
sub/data/org.freedesktop.NetworkManager.policy.in
# from meson build directory:
build/data/org.freedesktop.NetworkManager.policy.in