mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager
synced 2024-09-06 17:14:02 +00:00
src: drop generated nm-src-enum-types.h
We only needed proper glib enum types for having properties and signal arguments. These got all converted to plain int, so no longer generate such an enum type.
This commit is contained in:
parent
3bbc55fd9c
commit
002f17c25d
19
Makefile.am
19
Makefile.am
|
@ -1132,12 +1132,7 @@ src_libNetworkManagerBase_la_LIBADD = \
|
||||||
|
|
||||||
src_libNetworkManager_la_CPPFLAGS = $(src_cppflags)
|
src_libNetworkManager_la_CPPFLAGS = $(src_cppflags)
|
||||||
|
|
||||||
src_libNetworkManager_la_SOURCES_enum = \
|
|
||||||
src/nm-types.h \
|
|
||||||
$(NULL)
|
|
||||||
|
|
||||||
src_libNetworkManager_la_SOURCES = \
|
src_libNetworkManager_la_SOURCES = \
|
||||||
$(src_libNetworkManager_la_SOURCES_enum) \
|
|
||||||
\
|
\
|
||||||
src/nm-checkpoint-manager.c \
|
src/nm-checkpoint-manager.c \
|
||||||
src/nm-checkpoint-manager.h \
|
src/nm-checkpoint-manager.h \
|
||||||
|
@ -1303,8 +1298,6 @@ src_libNetworkManager_la_SOURCES = \
|
||||||
src/nm-dhcp6-config.h \
|
src/nm-dhcp6-config.h \
|
||||||
src/nm-dispatcher.c \
|
src/nm-dispatcher.c \
|
||||||
src/nm-dispatcher.h \
|
src/nm-dispatcher.h \
|
||||||
src/nm-src-enum-types.c \
|
|
||||||
src/nm-src-enum-types.h \
|
|
||||||
src/nm-exported-object.c \
|
src/nm-exported-object.c \
|
||||||
src/nm-exported-object.h \
|
src/nm-exported-object.h \
|
||||||
src/nm-firewall-manager.c \
|
src/nm-firewall-manager.c \
|
||||||
|
@ -1335,6 +1328,7 @@ src_libNetworkManager_la_SOURCES = \
|
||||||
src/nm-session-monitor.c \
|
src/nm-session-monitor.c \
|
||||||
src/nm-sleep-monitor.c \
|
src/nm-sleep-monitor.c \
|
||||||
src/nm-sleep-monitor.h \
|
src/nm-sleep-monitor.h \
|
||||||
|
src/nm-types.h \
|
||||||
src/NetworkManagerUtils.c \
|
src/NetworkManagerUtils.c \
|
||||||
src/NetworkManagerUtils.h \
|
src/NetworkManagerUtils.h \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
@ -1447,8 +1441,6 @@ src_nm_iface_helper_SOURCES = \
|
||||||
src/nm-ip6-config.c \
|
src/nm-ip6-config.c \
|
||||||
src/nm-ip6-config.h \
|
src/nm-ip6-config.h \
|
||||||
\
|
\
|
||||||
src/nm-src-enum-types.c \
|
|
||||||
src/nm-src-enum-types.h \
|
|
||||||
src/nm-multi-index.c \
|
src/nm-multi-index.c \
|
||||||
src/nm-multi-index.h \
|
src/nm-multi-index.h \
|
||||||
src/NetworkManagerUtils.c \
|
src/NetworkManagerUtils.c \
|
||||||
|
@ -1481,15 +1473,6 @@ src_nm_iface_helper_LDFLAGS = \
|
||||||
|
|
||||||
###############################################################################
|
###############################################################################
|
||||||
|
|
||||||
GLIB_GENERATED += \
|
|
||||||
src/nm-src-enum-types.h \
|
|
||||||
src/nm-src-enum-types.c
|
|
||||||
nm_src_enum_types_MKENUMS_H_FLAGS = --identifier-prefix NM --fhead '\#include <nm-core-enum-types.h>\n'
|
|
||||||
nm_src_enum_types_MKENUMS_C_FLAGS = --identifier-prefix NM --fhead '\#include "nm-default.h"\n'
|
|
||||||
nm_src_enum_types_sources = $(src_libNetworkManager_la_SOURCES_enum)
|
|
||||||
|
|
||||||
###############################################################################
|
|
||||||
|
|
||||||
EXTRA_DIST += \
|
EXTRA_DIST += \
|
||||||
src/org.freedesktop.NetworkManager.conf \
|
src/org.freedesktop.NetworkManager.conf \
|
||||||
src/nm-test-utils-core.h \
|
src/nm-test-utils-core.h \
|
||||||
|
|
|
@ -33,7 +33,6 @@
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
|
|
||||||
#include "nm-device-private.h"
|
#include "nm-device-private.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
#include "nm-platform.h"
|
#include "nm-platform.h"
|
||||||
#include "ppp-manager/nm-ppp-manager.h"
|
#include "ppp-manager/nm-ppp-manager.h"
|
||||||
#include "ppp-manager/nm-ppp-status.h"
|
#include "ppp-manager/nm-ppp-status.h"
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
#include "NetworkManagerUtils.h"
|
#include "NetworkManagerUtils.h"
|
||||||
#include "nm-device-private.h"
|
#include "nm-device-private.h"
|
||||||
#include "nm-platform.h"
|
#include "nm-platform.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
#include "nm-device-factory.h"
|
#include "nm-device-factory.h"
|
||||||
#include "nm-core-internal.h"
|
#include "nm-core-internal.h"
|
||||||
#include "nm-ip4-config.h"
|
#include "nm-ip4-config.h"
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
|
|
||||||
#include "NetworkManagerUtils.h"
|
#include "NetworkManagerUtils.h"
|
||||||
#include "nm-device-private.h"
|
#include "nm-device-private.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
#include "nm-platform.h"
|
#include "nm-platform.h"
|
||||||
#include "nm-device-factory.h"
|
#include "nm-device-factory.h"
|
||||||
#include "nm-core-internal.h"
|
#include "nm-core-internal.h"
|
||||||
|
|
|
@ -40,7 +40,6 @@
|
||||||
#include "nm-supplicant-config.h"
|
#include "nm-supplicant-config.h"
|
||||||
#include "ppp-manager/nm-ppp-manager.h"
|
#include "ppp-manager/nm-ppp-manager.h"
|
||||||
#include "ppp-manager/nm-ppp-status.h"
|
#include "ppp-manager/nm-ppp-status.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
#include "nm-platform.h"
|
#include "nm-platform.h"
|
||||||
#include "nm-platform-utils.h"
|
#include "nm-platform-utils.h"
|
||||||
#include "nm-dcb.h"
|
#include "nm-dcb.h"
|
||||||
|
|
|
@ -23,7 +23,6 @@
|
||||||
#include "nm-device-generic.h"
|
#include "nm-device-generic.h"
|
||||||
|
|
||||||
#include "nm-device-private.h"
|
#include "nm-device-private.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
#include "nm-platform.h"
|
#include "nm-platform.h"
|
||||||
#include "nm-core-internal.h"
|
#include "nm-core-internal.h"
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,6 @@
|
||||||
|
|
||||||
#include "NetworkManagerUtils.h"
|
#include "NetworkManagerUtils.h"
|
||||||
#include "nm-device-private.h"
|
#include "nm-device-private.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
#include "nm-act-request.h"
|
#include "nm-act-request.h"
|
||||||
#include "nm-ip4-config.h"
|
#include "nm-ip4-config.h"
|
||||||
#include "nm-platform.h"
|
#include "nm-platform.h"
|
||||||
|
|
|
@ -28,7 +28,6 @@
|
||||||
#include "nm-utils.h"
|
#include "nm-utils.h"
|
||||||
#include "NetworkManagerUtils.h"
|
#include "NetworkManagerUtils.h"
|
||||||
#include "nm-device-private.h"
|
#include "nm-device-private.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
#include "nm-settings.h"
|
#include "nm-settings.h"
|
||||||
#include "nm-act-request.h"
|
#include "nm-act-request.h"
|
||||||
#include "nm-ip4-config.h"
|
#include "nm-ip4-config.h"
|
||||||
|
|
|
@ -53,7 +53,6 @@
|
||||||
#include "nm-dhcp6-config.h"
|
#include "nm-dhcp6-config.h"
|
||||||
#include "nm-rfkill-manager.h"
|
#include "nm-rfkill-manager.h"
|
||||||
#include "nm-firewall-manager.h"
|
#include "nm-firewall-manager.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
#include "nm-settings-connection.h"
|
#include "nm-settings-connection.h"
|
||||||
#include "nm-settings.h"
|
#include "nm-settings.h"
|
||||||
#include "nm-auth-utils.h"
|
#include "nm-auth-utils.h"
|
||||||
|
|
|
@ -32,7 +32,6 @@
|
||||||
#include "NetworkManagerUtils.h"
|
#include "NetworkManagerUtils.h"
|
||||||
#include "nm-device-private.h"
|
#include "nm-device-private.h"
|
||||||
#include "nm-platform.h"
|
#include "nm-platform.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
#include "nm-core-internal.h"
|
#include "nm-core-internal.h"
|
||||||
#include "nm-ip4-config.h"
|
#include "nm-ip4-config.h"
|
||||||
#include "nm-dbus-compat.h"
|
#include "nm-dbus-compat.h"
|
||||||
|
|
|
@ -46,7 +46,6 @@
|
||||||
#include "nm-setting-connection.h"
|
#include "nm-setting-connection.h"
|
||||||
#include "nm-setting-olpc-mesh.h"
|
#include "nm-setting-olpc-mesh.h"
|
||||||
#include "nm-manager.h"
|
#include "nm-manager.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
#include "nm-platform.h"
|
#include "nm-platform.h"
|
||||||
|
|
||||||
/* This is a bug; but we can't really change API now... */
|
/* This is a bug; but we can't really change API now... */
|
||||||
|
|
|
@ -48,7 +48,6 @@
|
||||||
#include "nm-auth-utils.h"
|
#include "nm-auth-utils.h"
|
||||||
#include "nm-settings-connection.h"
|
#include "nm-settings-connection.h"
|
||||||
#include "nm-settings.h"
|
#include "nm-settings.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
#include "nm-core-internal.h"
|
#include "nm-core-internal.h"
|
||||||
#include "nm-config.h"
|
#include "nm-config.h"
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,6 @@
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
|
|
||||||
#include "nm-bus-manager.h"
|
#include "nm-bus-manager.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
#include "NetworkManagerUtils.h"
|
#include "NetworkManagerUtils.h"
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
|
|
|
@ -29,7 +29,6 @@
|
||||||
#include "nm-utils.h"
|
#include "nm-utils.h"
|
||||||
#include "nm-device.h"
|
#include "nm-device.h"
|
||||||
#include "NetworkManagerUtils.h"
|
#include "NetworkManagerUtils.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
#include "nm-core-internal.h"
|
#include "nm-core-internal.h"
|
||||||
#include "nm-keyfile-internal.h"
|
#include "nm-keyfile-internal.h"
|
||||||
|
|
||||||
|
|
|
@ -43,7 +43,6 @@
|
||||||
#include "nm-auth-manager.h"
|
#include "nm-auth-manager.h"
|
||||||
#include "NetworkManagerUtils.h"
|
#include "NetworkManagerUtils.h"
|
||||||
#include "nm-device-factory.h"
|
#include "nm-device-factory.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
#include "nm-sleep-monitor.h"
|
#include "nm-sleep-monitor.h"
|
||||||
#include "nm-connectivity.h"
|
#include "nm-connectivity.h"
|
||||||
#include "nm-policy.h"
|
#include "nm-policy.h"
|
||||||
|
|
|
@ -37,7 +37,6 @@
|
||||||
#include "nm-core-internal.h"
|
#include "nm-core-internal.h"
|
||||||
|
|
||||||
#include "nm-core-utils.h"
|
#include "nm-core-utils.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
#include "nm-platform-utils.h"
|
#include "nm-platform-utils.h"
|
||||||
#include "nmp-object.h"
|
#include "nmp-object.h"
|
||||||
#include "nmp-netns.h"
|
#include "nmp-netns.h"
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
#include "nm-secret-agent.h"
|
#include "nm-secret-agent.h"
|
||||||
#include "nm-auth-utils.h"
|
#include "nm-auth-utils.h"
|
||||||
#include "nm-setting-vpn.h"
|
#include "nm-setting-vpn.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
#include "nm-auth-manager.h"
|
#include "nm-auth-manager.h"
|
||||||
#include "nm-bus-manager.h"
|
#include "nm-bus-manager.h"
|
||||||
#include "nm-session-monitor.h"
|
#include "nm-session-monitor.h"
|
||||||
|
|
|
@ -30,7 +30,6 @@
|
||||||
#include "nm-setting-vpn.h"
|
#include "nm-setting-vpn.h"
|
||||||
#include "nm-vpn-dbus-interface.h"
|
#include "nm-vpn-dbus-interface.h"
|
||||||
#include "nm-core-internal.h"
|
#include "nm-core-internal.h"
|
||||||
#include "nm-src-enum-types.h"
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
GSList *plugins;
|
GSList *plugins;
|
||||||
|
|
Loading…
Reference in a new issue