mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-10-06 16:21:50 +00:00
libnm-util: move NetworkManager.h, etc, from include/ to here
NetworkManager.h, NetworkManagerVPN.h, and nm-version.h are part of the libnm-util API, so move them to libnm-util. include/ still contains headers that are strictly NM-internal (eg, nm-glib-compat.h).
This commit is contained in:
parent
f352bfd2af
commit
7eb0288aa0
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -85,8 +85,6 @@ valgrind-*.log
|
|||
/m4/wint_t.m4
|
||||
/m4/xsize.m4
|
||||
|
||||
/include/nm-version.h
|
||||
|
||||
/docs/libnm-glib/*.stamp
|
||||
/docs/libnm-glib/html/
|
||||
/docs/libnm-glib/tmpl/
|
||||
|
@ -168,6 +166,7 @@ valgrind-*.log
|
|||
/test/libnm_glib_test
|
||||
/test/nm-online
|
||||
/test/nmtestdevices
|
||||
/libnm-util/nm-version.h
|
||||
/libnm-util/nm-setting-docs.xml
|
||||
/libnm-util/test-crypto
|
||||
/libnm-util/tests/test-crypto
|
||||
|
|
|
@ -794,7 +794,6 @@ AM_CONDITIONAL(SETTING_DOCS_AVAILABLE, test "$build_setting_docs" = "yes" -o "$h
|
|||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
include/Makefile
|
||||
include/nm-version.h
|
||||
src/Makefile
|
||||
src/tests/Makefile
|
||||
src/config/tests/Makefile
|
||||
|
@ -829,6 +828,7 @@ src/devices/wifi/Makefile
|
|||
src/devices/wifi/tests/Makefile
|
||||
src/devices/wwan/Makefile
|
||||
libnm-util/libnm-util.pc
|
||||
libnm-util/nm-version.h
|
||||
libnm-util/Makefile
|
||||
libnm-util/tests/Makefile
|
||||
libnm-util/tests/certs/Makefile
|
||||
|
|
|
@ -70,8 +70,6 @@ extra_files = libnm-glib.png
|
|||
# CFLAGS and LDFLAGS for compiling scan program. Only needed
|
||||
# if $(DOC_MODULE).types is non-empty.
|
||||
GTKDOC_CFLAGS = \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_builddir)/include \
|
||||
-I$(top_srcdir)/libnm-util \
|
||||
-I$(top_builddir)/libnm-util \
|
||||
-I$(top_srcdir)/libnm-glib \
|
||||
|
|
|
@ -50,7 +50,6 @@ extra_files =
|
|||
# CFLAGS and LDFLAGS for compiling scan program. Only needed
|
||||
# if $(DOC_MODULE).types is non-empty.
|
||||
GTKDOC_CFLAGS = \
|
||||
-I$(top_srcdir)/include \
|
||||
-I$(top_srcdir)/libnm-util \
|
||||
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
|
||||
$(GLIB_CFLAGS) \
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
AM_CPPFLAGS = \
|
||||
-I${top_srcdir}/include \
|
||||
-I${top_builddir}/include \
|
||||
-I${top_srcdir}/libnm-util \
|
||||
-I${top_builddir}/libnm-util \
|
||||
$(DBUS_CFLAGS) \
|
||||
$(QT_CFLAGS)
|
||||
|
||||
|
|
|
@ -1,17 +1,6 @@
|
|||
EXTRA_DIST = \
|
||||
NetworkManager.h \
|
||||
NetworkManagerVPN.h \
|
||||
nm-dbus-glib-types.h \
|
||||
nm-glib-compat.h \
|
||||
nm-gvaluearray-compat.h \
|
||||
nm-test-utils.h \
|
||||
nm-version.h.in \
|
||||
nm-settings-flags.h
|
||||
|
||||
NetworkManagerincludedir=$(includedir)/NetworkManager
|
||||
|
||||
NetworkManagerinclude_HEADERS = \
|
||||
NetworkManager.h \
|
||||
NetworkManagerVPN.h \
|
||||
nm-version.h
|
||||
|
||||
|
|
|
@ -23,6 +23,8 @@ endif
|
|||
lib_LTLIBRARIES=libnm-util.la
|
||||
|
||||
libnm_util_include_HEADERS = \
|
||||
NetworkManager.h \
|
||||
NetworkManagerVPN.h \
|
||||
nm-connection.h \
|
||||
nm-setting.h \
|
||||
nm-setting-8021x.h \
|
||||
|
@ -52,7 +54,8 @@ libnm_util_include_HEADERS = \
|
|||
nm-setting-wireless-security.h \
|
||||
nm-setting-vpn.h \
|
||||
nm-utils-enum-types.h \
|
||||
nm-utils.h
|
||||
nm-utils.h \
|
||||
nm-version.h
|
||||
|
||||
libnm_util_la_private_headers = \
|
||||
crypto.h \
|
||||
|
@ -101,7 +104,7 @@ libnm_util_la_SOURCES = \
|
|||
|
||||
GLIB_GENERATED = nm-utils-enum-types.h nm-utils-enum-types.c
|
||||
BUILT_SOURCES = $(GLIB_GENERATED)
|
||||
nm_utils_enum_types_sources = $(libnm_util_include_HEADERS)
|
||||
nm_utils_enum_types_sources = $(filter-out NetworkManager%,$(libnm_util_include_HEADERS))
|
||||
GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
|
||||
GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
|
||||
|
||||
|
@ -152,7 +155,7 @@ pkgconfig_DATA = libnm-util.pc
|
|||
DISTCLEANFILES = libnm-util.pc
|
||||
CLEANFILES =
|
||||
|
||||
EXTRA_DIST = libnm-util.pc.in libnm-util.ver
|
||||
EXTRA_DIST = libnm-util.pc.in libnm-util.ver nm-version.h.in
|
||||
|
||||
-include $(INTROSPECTION_MAKEFILE)
|
||||
INTROSPECTION_GIRS =
|
||||
|
@ -160,7 +163,7 @@ INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir)
|
|||
INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir)
|
||||
|
||||
if HAVE_INTROSPECTION
|
||||
introspection_sources = $(libnm_util_include_HEADERS) $(libnm_util_la_csources) $(top_srcdir)/include/NetworkManager.h $(top_srcdir)/include/NetworkManagerVPN.h
|
||||
introspection_sources = $(libnm_util_include_HEADERS) $(libnm_util_la_csources)
|
||||
|
||||
NetworkManager-1.0.gir: libnm-util.la
|
||||
NetworkManager_1_0_gir_INCLUDES = GObject-2.0 DBusGLib-1.0
|
||||
|
|
|
@ -20,6 +20,12 @@
|
|||
* (C) Copyright 2004 - 2013 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
/* Definitions related to NetworkManager's D-Bus interfaces.
|
||||
*
|
||||
* Note that although this header is installed as part of libnm-util, it is also
|
||||
* used by some external code that does not link to libnm-util.
|
||||
*/
|
||||
|
||||
#ifndef NETWORK_MANAGER_H
|
||||
#define NETWORK_MANAGER_H
|
||||
|
|
@ -19,6 +19,12 @@
|
|||
* (C) Copyright 2004 Red Hat, Inc.
|
||||
*/
|
||||
|
||||
/* D-Bus-related definitions for NetworkManager VPN plugins.
|
||||
*
|
||||
* Note that although this header is installed as part of libnm-util, it is also
|
||||
* used by some external code that does not link to libnm-util.
|
||||
*/
|
||||
|
||||
#ifndef NETWORK_MANAGER_VPN_H
|
||||
#define NETWORK_MANAGER_VPN_H
|
||||
|
|
@ -3,6 +3,7 @@ if WITH_PPP
|
|||
AM_CPPFLAGS = \
|
||||
-I${top_builddir}/include \
|
||||
-I${top_srcdir}/include \
|
||||
-I${top_srcdir}/libnm-util \
|
||||
-DG_LOG_DOMAIN=\""nm-pppd-plugin"\" \
|
||||
-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
|
||||
$(DBUS_CFLAGS) \
|
||||
|
|
Loading…
Reference in a new issue