From 37075878a7a9018d6fcdb05c78468fe7c70f99a5 Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Fri, 5 Feb 2021 16:43:41 +0100 Subject: [PATCH] libnm: compile keyfile code like libnm-core By now, keyfile code got relicensed as LGPL-2.1+ and is just a regular part of libnm-core (in particular, because it uses private API of libnm-core). It should no longer be in a separate directory, but for now, at lead compile it the same as libnm-core. --- Makefile.am | 2 +- libnm-core/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index f5cb28cb44..59b885a861 100644 --- a/Makefile.am +++ b/Makefile.am @@ -666,7 +666,7 @@ libnm_core_nm_keyfile_libnm_keyfile_la_CPPFLAGS = \ $(GLIB_CFLAGS) \ $(SANITIZER_LIB_CFLAGS) \ -DG_LOG_DOMAIN=\""libnm"\" \ - -DNETWORKMANAGER_COMPILATION='(NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)' \ + -DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE \ $(NULL) libnm_core_nm_keyfile_libnm_keyfile_la_SOURCES = \ diff --git a/libnm-core/meson.build b/libnm-core/meson.build index a02bbe1bf2..4883d695b5 100644 --- a/libnm-core/meson.build +++ b/libnm-core/meson.build @@ -253,7 +253,7 @@ libnm_keyfile = static_library( dependencies: libnm_glib_aux_dep, c_args: [ '-DG_LOG_DOMAIN="@0@"'.format(libnm_name), - '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_WITH_LIBNM_CORE_INTERNAL|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)', + '-DNETWORKMANAGER_COMPILATION=NM_NETWORKMANAGER_COMPILATION_LIBNM_CORE', ], link_with: libnm_libnm_core_intern, )