diff options
author | Thomas Haller <thaller@redhat.com> | 2019-04-20 21:04:18 +0200 |
---|---|---|
committer | Thomas Haller <thaller@redhat.com> | 2019-04-25 07:45:31 +0200 |
commit | 14b94e6adfde579bbb96e8c9d4932324374abb9b (patch) | |
tree | 0c15221f782f3693b0d17ab36a1724baf41716cd | |
parent | bb9e3195d2dc81ce492b6b811d85f27ac6efacab (diff) | |
download | NetworkManager-14b94e6adfde579bbb96e8c9d4932324374abb9b.tar.gz |
shared: add "nm-libnm-core-aux/nm-libnm-core-aux.h"
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | libnm-core/meson.build | 3 | ||||
-rw-r--r-- | shared/nm-libnm-core-aux/nm-libnm-core-aux.c | 23 | ||||
-rw-r--r-- | shared/nm-libnm-core-aux/nm-libnm-core-aux.h | 24 |
4 files changed, 51 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 21359e5d6e..b950f8fafa 100644 --- a/Makefile.am +++ b/Makefile.am @@ -449,6 +449,8 @@ shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_CPPFLAGS = \ shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_SOURCES = \ shared/nm-libnm-core-aux/nm-dispatcher-api.h \ + shared/nm-libnm-core-aux/nm-libnm-core-aux.c \ + shared/nm-libnm-core-aux/nm-libnm-core-aux.h \ $(NULL) shared_nm_libnm_core_aux_libnm_libnm_core_aux_la_LDFLAGS = \ diff --git a/libnm-core/meson.build b/libnm-core/meson.build index bc2d087a15..25ed019831 100644 --- a/libnm-core/meson.build +++ b/libnm-core/meson.build @@ -256,7 +256,7 @@ libnm_core_dep = declare_dependency( shared_nm_libnm_core_aux = static_library( 'nm-libnm-core-aux', - sources: files('../shared/nm-libnm-core-aux/nm-dispatcher-api.h'), + sources: files('../shared/nm-libnm-core-aux/nm-libnm-core-aux.c'), c_args: [ '-DG_LOG_DOMAIN="@0@"'.format(libnm_name), '-DNETWORKMANAGER_COMPILATION=(NM_NETWORKMANAGER_COMPILATION_WITH_GLIB|NM_NETWORKMANAGER_COMPILATION_WITH_GLIB_I18N_LIB)', @@ -270,6 +270,7 @@ shared_nm_libnm_core_aux = static_library( glib_dep, shared_c_siphash_dep, shared_nm_glib_aux_dep, + libnm_core_dep, ], ) diff --git a/shared/nm-libnm-core-aux/nm-libnm-core-aux.c b/shared/nm-libnm-core-aux/nm-libnm-core-aux.c new file mode 100644 index 0000000000..b312ef42b9 --- /dev/null +++ b/shared/nm-libnm-core-aux/nm-libnm-core-aux.c @@ -0,0 +1,23 @@ +/* NetworkManager -- Network link manager + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * (C) Copyright 2019 Red Hat, Inc. + */ + +#include "nm-default.h" + +#include "nm-libnm-core-aux.h" diff --git a/shared/nm-libnm-core-aux/nm-libnm-core-aux.h b/shared/nm-libnm-core-aux/nm-libnm-core-aux.h new file mode 100644 index 0000000000..5fc8f69b4c --- /dev/null +++ b/shared/nm-libnm-core-aux/nm-libnm-core-aux.h @@ -0,0 +1,24 @@ +/* NetworkManager -- Network link manager + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + * Boston, MA 02110-1301 USA. + * + * (C) Copyright 2019 Red Hat, Inc. + */ + +#ifndef __NM_LIBNM_CORE_AUX_H__ +#define __NM_LIBNM_CORE_AUX_H__ + +#endif /* __NM_LIBNM_CORE_AUX_H__ */ |