build: drop generating empty nm-*-enum-types for device plugins

The device plugins adsl, team and wifi were generating empty
"nm-*-enum-types" header and source files.

6 files changed, 3 insertions, 40 deletions

diff --git a/src/devices/adsl/Makefile.am b/src/devices/adsl/Makefile.am
index fa32c25a4d..b082ffc4ff 100644
--- a/src/devices/adsl/Makefile.am
+++ b/src/devices/adsl/Makefile.am
@@ -17,13 +17,6 @@ AM_CPPFLAGS = \
 	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	$(GUDEV_CFLAGS)
 
-GLIB_GENERATED = nm-adsl-enum-types.h nm-adsl-enum-types.c
-GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
-GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
-nm_adsl_enum_types_sources = $(srcdir)/nm-device-adsl.h
-
-BUILT_SOURCES = $(GLIB_GENERATED)
-
 pkglib_LTLIBRARIES = libnm-device-plugin-adsl.la
 
 SYMBOL_VIS_FILE=$(srcdir)/exports.ver
@@ -32,9 +25,7 @@ libnm_device_plugin_adsl_la_SOURCES = \
 	nm-atm-manager.c \
 	nm-atm-manager.h \
 	nm-device-adsl.c \
-	nm-device-adsl.h \
-	\
-	$(BUILT_SOURCES)
+	nm-device-adsl.h
 
 libnm_device_plugin_adsl_la_LDFLAGS = \
 	-module -avoid-version \
@@ -44,7 +35,6 @@ libnm_device_plugin_adsl_la_LIBADD = \
 	$(top_builddir)/introspection/libnmdbus.la \
 	$(GUDEV_LIBS)
 
-CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST = $(SYMBOL_VIS_FILE)
 
 if ENABLE_TESTS
diff --git a/src/devices/team/Makefile.am b/src/devices/team/Makefile.am
index 13559a1867..3df138609d 100644
--- a/src/devices/team/Makefile.am
+++ b/src/devices/team/Makefile.am
@@ -21,13 +21,6 @@ if WITH_TEAMDCTL
 AM_CPPFLAGS += ${LIBTEAMDCTL_CFLAGS}
 endif
 
-GLIB_GENERATED = nm-team-enum-types.h nm-team-enum-types.c
-GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
-GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
-nm_team_enum_types_sources = $(srcdir)/nm-device-team.h
-
-BUILT_SOURCES = $(GLIB_GENERATED)
-
 pkglib_LTLIBRARIES = libnm-device-plugin-team.la
 
 SYMBOL_VIS_FILE=$(srcdir)/exports.ver
@@ -36,9 +29,7 @@ libnm_device_plugin_team_la_SOURCES = \
 	nm-device-team.c \
 	nm-device-team.h \
 	nm-team-factory.c \
-	nm-team-factory.h \
-	\
-	$(BUILT_SOURCES)
+	nm-team-factory.h
 
 libnm_device_plugin_team_la_LDFLAGS = \
 	-module -avoid-version \
@@ -53,7 +44,6 @@ if WITH_TEAMDCTL
 libnm_device_plugin_team_la_LIBADD += $(LIBTEAMDCTL_LIBS)
 endif
 
-CLEANFILES = $(BUILT_SOURCES)
 EXTRA_DIST = $(SYMBOL_VIS_FILE)
 
 if ENABLE_TESTS
diff --git a/src/devices/team/nm-device-team.c b/src/devices/team/nm-device-team.c
index f20d0922f8..a6679e422e 100644
--- a/src/devices/team/nm-device-team.c
+++ b/src/devices/team/nm-device-team.c
@@ -33,7 +33,6 @@
 #include "nm-device-private.h"
 #include "nm-platform.h"
 #include "nm-enum-types.h"
-#include "nm-team-enum-types.h"
 #include "nm-core-internal.h"
 #include "nm-ip4-config.h"
 #include "nm-dbus-compat.h"
diff --git a/src/devices/wifi/Makefile.am b/src/devices/wifi/Makefile.am
index 250727f025..df21597d38 100644
--- a/src/devices/wifi/Makefile.am
+++ b/src/devices/wifi/Makefile.am
@@ -23,16 +23,6 @@ AM_CPPFLAGS = \
 	-DNM_VERSION_MAX_ALLOWED=NM_VERSION_NEXT_STABLE \
 	$(GLIB_CFLAGS)
 
-GLIB_GENERATED = nm-wifi-enum-types.h nm-wifi-enum-types.c
-GLIB_MKENUMS_H_FLAGS = --identifier-prefix NM
-GLIB_MKENUMS_C_FLAGS = --identifier-prefix NM
-nm_wifi_enum_types_sources = \
-	$(srcdir)/nm-device-wifi.h \
-	$(srcdir)/nm-wifi-ap.h \
-	$(srcdir)/nm-device-olpc-mesh.h
-
-BUILT_SOURCES = $(GLIB_GENERATED)
-
 pkglib_LTLIBRARIES = libnm-device-plugin-wifi.la
 
 libnm_device_plugin_wifi_la_SOURCES = \
@@ -44,9 +34,7 @@ libnm_device_plugin_wifi_la_SOURCES = \
 	nm-wifi-ap-utils.c \
 	nm-wifi-ap-utils.h \
 	nm-device-olpc-mesh.c \
-	nm-device-olpc-mesh.h \
-	\
-	$(BUILT_SOURCES)
+	nm-device-olpc-mesh.h
 
 SYMBOL_VIS_FILE=$(srcdir)/exports.ver
 
@@ -59,8 +47,6 @@ libnm_device_plugin_wifi_la_LIBADD = \
 	$(GLIB_LIBS) \
 	$(GUDEV_LIBS)
 
-CLEANFILES = $(BUILT_SOURCES)
-
 EXTRA_DIST = $(SYMBOL_VIS_FILE)
 
 if ENABLE_TESTS
diff --git a/src/devices/wifi/nm-device-olpc-mesh.c b/src/devices/wifi/nm-device-olpc-mesh.c
index f656e4efb3..38f1f88dd4 100644
--- a/src/devices/wifi/nm-device-olpc-mesh.c
+++ b/src/devices/wifi/nm-device-olpc-mesh.c
@@ -48,7 +48,6 @@
 #include "nm-manager.h"
 #include "nm-enum-types.h"
 #include "nm-platform.h"
-#include "nm-wifi-enum-types.h"
 
 /* This is a bug; but we can't really change API now... */
 #include "nm-vpn-dbus-interface.h"
diff --git a/src/devices/wifi/nm-device-wifi.c b/src/devices/wifi/nm-device-wifi.c
index 7415f7ac1c..a208b3a892 100644
--- a/src/devices/wifi/nm-device-wifi.c
+++ b/src/devices/wifi/nm-device-wifi.c
@@ -47,7 +47,6 @@
 #include "nm-auth-utils.h"
 #include "nm-settings-connection.h"
 #include "nm-enum-types.h"
-#include "nm-wifi-enum-types.h"
 #include "nm-connection-provider.h"
 #include "nm-core-internal.h"