diff options
| author | Thomas Haller <thaller@redhat.com> | 2020-11-02 23:34:37 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2021-06-10 21:37:28 +0200 |
| commit | 650f83212eac1a185f841071b2154df9230eca70 (patch) | |
| tree | a647c248b812401607fd6360f5e9a1a68f8ff981 | |
| parent | abcbb03fda19f4c57c1517d007aaea8ee021af24 (diff) | |
| download | NetworkManager-650f83212eac1a185f841071b2154df9230eca70.tar.gz | |
libnm: with meson include "nm-default.h" for glib-mkenums sources
We also do that for the autotools implementation.
(cherry picked from commit fd57e9665cea3547ce63ad3d693d956cb8c286c7)
(cherry picked from commit c807e77271af7972abcecd637cae85e7664cbcc9)
(cherry picked from commit 63f2d73b970bba7d2b9ff5e67715e0aefe7fb2d2)
(cherry picked from commit 6efb6696c7af7f2b7ae3ff007144ad22cb4378d5)
(cherry picked from commit ea9c19ec9d43ecb533c46081140f5453c6f61a0f)
(cherry picked from commit 8d94c7e291e36f06febd98772eca32ac939e1ab5)
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | libnm-core/nm-core-enum-types.c.template | 2 | ||||
| -rw-r--r-- | libnm-core/tests/nm-core-tests-enum-types.c.template | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index 0c9f4f3ef3..e18a284794 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4650,6 +4650,7 @@ GLIB_GENERATED += \ $(libnm_util_lib_h_pub_mkenums) \ $(libnm_util_lib_c_mkenums) nm_utils_enum_types_sources = $(filter-out libnm-util/NetworkManager%,$(libnm_util_lib_h_pub_real)) +nm_utils_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' $(libnm_util_libnm_util_la_OBJECTS): $(libnm_util_lib_h_pub_mkenums) @@ -4988,6 +4989,7 @@ GLIB_GENERATED += \ $(libnm_glib_lib_h_pub_mkenums) \ $(libnm_glib_lib_c_mkenums) nm_glib_enum_types_sources = $(libnm_glib_lib_h_pub_real) +nm_glib_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' $(libnm_glib_libnm_glib_la_OBJECTS): $(libnm_glib_lib_h_pub_mkenums) @@ -5028,6 +5030,7 @@ GLIB_GENERATED += \ $(libnm_glib_vpn_h_mkenums) \ $(libnm_glib_vpn_c_mkenums) nm_vpn_enum_types_sources = $(libnm_glib_vpn_h_real) +nm_vpn_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n' $(libnm_glib_libnm_glib_vpn_la_OBJECTS): $(libnm_glib_vpn_h_mkenums) diff --git a/libnm-core/nm-core-enum-types.c.template b/libnm-core/nm-core-enum-types.c.template index 94744827ba..46977d8d37 100644 --- a/libnm-core/nm-core-enum-types.c.template +++ b/libnm-core/nm-core-enum-types.c.template @@ -1,5 +1,5 @@ /*** BEGIN file-header ***/ -#include "config.h" +#include "nm-default.h" #include "nm-core-enum-types.h" #include "nm-default.h" diff --git a/libnm-core/tests/nm-core-tests-enum-types.c.template b/libnm-core/tests/nm-core-tests-enum-types.c.template index 1160be86dc..dab286a3dd 100644 --- a/libnm-core/tests/nm-core-tests-enum-types.c.template +++ b/libnm-core/tests/nm-core-tests-enum-types.c.template @@ -1,5 +1,5 @@ /*** BEGIN file-header ***/ -#include "config.h" +#include "nm-default.h" #include "nm-core-tests-enum-types.h" |