mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-07 00:31:11 +00:00
libnm: move "nm-version-macros.h" from shared/ to libnm-core/
"nm-version-macros.h" is used directly by libnm-core and indirectly by libnm and core. Let's not have it randomly under shared/. Move it closer to where it's used.
This commit is contained in:
parent
a2ef576905
commit
318824cb41
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -136,7 +136,6 @@ test-*.trs
|
|||
/shared/nm-glib-aux/tests/test-json-aux
|
||||
/shared/nm-glib-aux/tests/test-shared-general
|
||||
/shared/nm-platform/tests/test-nm-platform
|
||||
/shared/nm-version-macros.h
|
||||
|
||||
/introspection/org.freedesktop.NetworkManager*.[ch]
|
||||
|
||||
|
@ -149,6 +148,7 @@ test-*.trs
|
|||
/libnm-core/tests/test-secrets
|
||||
/libnm-core/tests/test-setting
|
||||
/libnm-core/nm-dbus-types.xml
|
||||
/libnm-core/nm-version-macros.h
|
||||
/libnm-core/nm-vpn-dbus-types.xml
|
||||
|
||||
/libnm/nm-property-infos-dbus.xml
|
||||
|
@ -349,6 +349,7 @@ test-*.trs
|
|||
/policy/org.freedesktop.NetworkManager.policy
|
||||
/policy/org.freedesktop.NetworkManager.policy.in
|
||||
/shared/nm-utils/tests/test-shared-general
|
||||
/shared/nm-version-macros.h
|
||||
/src/devices/tests/test-arping
|
||||
/src/devices/wifi/tests/test-general
|
||||
/src/devices/wifi/tests/test-wifi-ap-utils
|
||||
|
|
|
@ -1003,7 +1003,6 @@ check_local += check-docs
|
|||
###############################################################################
|
||||
|
||||
libnm_core_lib_h_pub_real = \
|
||||
shared/nm-version-macros.h \
|
||||
libnm-core/nm-connection.h \
|
||||
libnm-core/nm-core-types.h \
|
||||
libnm-core/nm-dbus-interface.h \
|
||||
|
@ -1064,6 +1063,7 @@ libnm_core_lib_h_pub_real = \
|
|||
libnm-core/nm-setting.h \
|
||||
libnm-core/nm-simple-connection.h \
|
||||
libnm-core/nm-utils.h \
|
||||
libnm-core/nm-version-macros.h \
|
||||
libnm-core/nm-version.h \
|
||||
libnm-core/nm-vpn-dbus-interface.h \
|
||||
libnm-core/nm-vpn-editor-plugin.h \
|
||||
|
@ -1420,7 +1420,6 @@ EXTRA_DIST += \
|
|||
###############################################################################
|
||||
|
||||
libnm_lib_h_pub_real = \
|
||||
shared/nm-version-macros.h \
|
||||
libnm/NetworkManager.h \
|
||||
libnm/nm-access-point.h \
|
||||
libnm/nm-active-connection.h \
|
||||
|
@ -5393,9 +5392,10 @@ EXTRA_DIST += \
|
|||
shared/nm-utils/nm-vpn-plugin-macros.h \
|
||||
shared/nm-utils/nm-vpn-plugin-utils.c \
|
||||
shared/nm-utils/nm-vpn-plugin-utils.h \
|
||||
shared/nm-version-macros.h.in \
|
||||
shared/meson.build \
|
||||
\
|
||||
libnm-core/nm-version-macros.h.in \
|
||||
\
|
||||
tools/check-config-options.sh \
|
||||
tools/check-docs.sh \
|
||||
tools/check-exports.sh \
|
||||
|
|
|
@ -1293,7 +1293,7 @@ AC_SUBST(AM_CFLAGS)
|
|||
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
shared/nm-version-macros.h
|
||||
libnm-core/nm-version-macros.h
|
||||
libnm/libnm.pc
|
||||
po/Makefile.in
|
||||
data/org.freedesktop.NetworkManager.policy.in
|
||||
|
|
|
@ -2,6 +2,12 @@
|
|||
|
||||
libnm_core_inc = include_directories('.')
|
||||
|
||||
nm_version_macro_header = configure_file(
|
||||
input: 'nm-version-macros.h.in',
|
||||
output: '@BASENAME@',
|
||||
configuration: data_conf,
|
||||
)
|
||||
|
||||
libnm_core_nm_default_dep = declare_dependency(
|
||||
sources: nm_version_macro_header,
|
||||
include_directories: libnm_core_inc,
|
||||
|
|
|
@ -94,12 +94,6 @@ libn_dhcp4_dep = declare_dependency(
|
|||
link_with: libn_dhcp4,
|
||||
)
|
||||
|
||||
nm_version_macro_header = configure_file(
|
||||
input: 'nm-version-macros.h.in',
|
||||
output: '@BASENAME@',
|
||||
configuration: data_conf,
|
||||
)
|
||||
|
||||
nm_test_utils_impl_source = files('nm-test-utils-impl.c')
|
||||
|
||||
nm_vpn_plugin_utils_source = files('nm-utils/nm-vpn-plugin-utils.c')
|
||||
|
|
Loading…
Reference in a new issue