[libchamplain] Eliminate glib-mkenums call from champlain-gtk
- From: Jiří Techet <jiritechet src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [libchamplain] Eliminate glib-mkenums call from champlain-gtk
- Date: Thu, 21 Feb 2019 11:22:38 +0000 (UTC)
commit cc66af7d244431350bc80e08f48a51c8e8a5e616
Author: Jiří Techet <techet gmail com>
Date: Thu Feb 21 01:48:08 2019 +0100
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.
champlain-gtk/Makefile.am | 20 -----------------
champlain-gtk/champlain-gtk-enum-types.c.in | 33 -----------------------------
champlain-gtk/champlain-gtk-enum-types.h.in | 24 ---------------------
champlain-gtk/meson.build | 19 -----------------
4 files changed, 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/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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]