diff --git a/.gitignore b/.gitignore index 45d9e3503f..0a7f0c195a 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/Makefile.am b/Makefile.am index 75d08d08a1..6c6b3c2ed9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ diff --git a/configure.ac b/configure.ac index cd5837eb2a..bd3cf3caa6 100644 --- a/configure.ac +++ b/configure.ac @@ -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 diff --git a/libnm-core/meson.build b/libnm-core/meson.build index a6bc6a1839..ec9fb8ce52 100644 --- a/libnm-core/meson.build +++ b/libnm-core/meson.build @@ -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, diff --git a/shared/nm-version-macros.h.in b/libnm-core/nm-version-macros.h.in similarity index 100% rename from shared/nm-version-macros.h.in rename to libnm-core/nm-version-macros.h.in diff --git a/shared/meson.build b/shared/meson.build index 54f9c3f8ed..52eb6b9b10 100644 --- a/shared/meson.build +++ b/shared/meson.build @@ -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')