Eliminate glib-mkenums call from champlain-gtk

champlain-gtk is just a thin wrapper around ClutterEmbed and doesn't
(and probably never will) define any enumerations.

4 files changed, 0 insertions, 96 deletions

diff --git a/champlain-gtk/Makefile.am b/champlain-gtk/Makefile.am
index 9e5d82f..c8742be 100644
--- a/champlain-gtk/Makefile.am
+++ b/champlain-gtk/Makefile.am
@@ -11,28 +11,10 @@ libchamplain_gtk_headers_public =	\
 libchamplain_gtk_sources = \
 	gtk-champlain-embed.c
 
-
-# glib-mkenums rules
-glib_enum_h = champlain-gtk-enum-types.h
-glib_enum_c = champlain-gtk-enum-types.c
-glib_enum_headers = $(libchamplain_gtk_headers_public)
-include $(top_srcdir)/build/Makefile.am.enums
-
-libchamplain_gtk_headers_built =	\
-	champlain-gtk-enum-types.h
-
-libchamplain_gtk_sources_built =	\
-	champlain-gtk-enum-types.c
-
-
 libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_SOURCES = \
 	$(libchamplain_gtk_headers_public)	\
 	$(libchamplain_gtk_sources)
 
-nodist_libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_SOURCES = \
-	$(libchamplain_gtk_headers_built)	\
-	$(libchamplain_gtk_sources_built)
-
 libchamplain_gtk_@CHAMPLAIN_API_VERSION@_la_LIBADD = \
 	$(GTK_LIBS) 	\
 	$(top_builddir)/champlain/libchamplain-@CHAMPLAIN_API_VERSION@.la
@@ -51,8 +33,6 @@ libchamplain_gtkdir=$(includedir)/libchamplain-gtk-@CHAMPLAIN_API_VERSION@/champ
 
 libchamplain_gtk_HEADERS = $(libchamplain_gtk_headers_public)
 
-nodist_libchamplain_gtk_HEADERS = $(libchamplain_gtk_headers_built)
-
 # Make the g-ir-scanner to find the not yet installed pkg-config files.
 PKG_CONFIG_PATH := $(top_builddir):$(PKG_CONFIG_PATH)
 
diff --git a/champlain-gtk/champlain-gtk-enum-types.c.in b/champlain-gtk/champlain-gtk-enum-types.c.in
deleted file mode 100644
index 8e4989a..0000000
--- a/champlain-gtk/champlain-gtk-enum-types.c.in
+++ /dev/null
@@ -1,33 +0,0 @@
-/*** BEGIN file-header ***/
-#include "champlain-gtk.h"
-/*** END file-header ***/
-
-/*** BEGIN file-production ***/
-/* enumerations from "@filename@" */
-/*** END file-production ***/
-
-/*** BEGIN value-header ***/
-GType
-@enum_name@_get_type (void)
-{
-	static GType etype = 0;
-	if (G_UNLIKELY (etype == 0)) {
-		static const G@Type@Value values[] = {
-/*** END value-header ***/
-
-/*** BEGIN value-production ***/
-			{ @VALUENAME@, "@VALUENAME@", "@valuenick@" },
-/*** END value-production ***/
-
-/*** BEGIN value-tail ***/
-			{ 0, NULL, NULL }
-		};
-		etype = g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
-	}
-	return etype;
-}
-
-/*** END value-tail ***/
-
-/*** BEGIN file-tail ***/
-/*** END file-tail ***/
diff --git a/champlain-gtk/champlain-gtk-enum-types.h.in b/champlain-gtk/champlain-gtk-enum-types.h.in
deleted file mode 100644
index 3c3561a..0000000
--- a/champlain-gtk/champlain-gtk-enum-types.h.in
+++ /dev/null
@@ -1,24 +0,0 @@
-/*** BEGIN file-header ***/
-#ifndef __CHAMPLAIN_GTK_ENUM_TYPES_H__
-#define __CHAMPLAIN_GTK_ENUM_TYPES_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-/*** END file-header ***/
-
-/*** BEGIN file-production ***/
-
-/* enumerations from "@filename@" */
-/*** END file-production ***/
-
-/*** BEGIN value-header ***/
-GType @enum_name@_get_type (void) G_GNUC_CONST;
-#define CHAMPLAIN_GTK_TYPE_@ENUMSHORT@ @enum_name@_get_type()
-/*** END value-header ***/
-
-/*** BEGIN file-tail ***/
-G_END_DECLS
-
-#endif /* __CHAMPLAIN_GTK_ENUM_TYPES_H__ */
-/*** END file-tail ***/
diff --git a/champlain-gtk/meson.build b/champlain-gtk/meson.build
index 7fb4fdf..c3b579a 100644
--- a/champlain-gtk/meson.build
+++ b/champlain-gtk/meson.build
@@ -26,24 +26,6 @@ libchamplain_gtk_c_args = [
 libchamplain_gtk_link_args = [
 ]
 
-libchamplain_gtk_enums = gnome.mkenums(
-  'champlain-gtk-enum-types',
-  sources: libchamplain_gtk_public_h,
-  h_template: 'champlain-gtk-enum-types.h.in',
-  c_template: 'champlain-gtk-enum-types.c.in',
-  install_header: true,
-  install_dir: join_paths(
-    pkgincludedir,
-    'champlain-gtk',
-  )
-)
-
-libchamplain_gtk_enums_h = libchamplain_gtk_enums.get(1)
-
-libchamplain_gtk_sources += [
-  libchamplain_gtk_enums,
-]
-
 install_headers(
   libchamplain_gtk_public_h,
   install_dir: join_paths(
@@ -65,7 +47,6 @@ libchamplain_gtk_sha = library(
 )
 
 libchamplain_gtk_dep_sources = [
-  libchamplain_gtk_enums_h,
 ]
 
 if generate_gir