mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-06 17:14:02 +00:00
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.
This commit is contained in:
parent
6cbc2d715f
commit
37075878a7
|
@ -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 = \
|
||||
|
|
|
@ -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,
|
||||
)
|
||||
|
|
Loading…
Reference in a new issue