[vinagre] Remove unused enums generation rules



commit f06e5e1ccfbabfa8a1a702d8e4b83b737beca924
Author: David King <amigadave amigadave com>
Date:   Sat Mar 12 12:52:20 2011 +0100

    Remove unused enums generation rules

 .gitignore                   |    1 -
 Makefile.am                  |   38 --------------------------------------
 configure.ac                 |    7 -------
 vinagre/vinagre-connection.c |    1 -
 4 files changed, 0 insertions(+), 47 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 8e1a55d..5a0021e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -86,5 +86,4 @@ Makefile.in
 /vinagre/view/.dirstamp
 /vinagre/view/.libs
 /vinagre/vinagre
-/vinagre/vinagre-enums.*
 /xmldocs.make
diff --git a/Makefile.am b/Makefile.am
index 505695d..c15a903 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,6 @@ noinst_vinagreh_headers = \
 	vinagre/view/autoDrawer.h \
 	vinagre/view/drawer.h \
 	vinagre/view/ovBox.h \
-	vinagre/vinagre-enums.h \
 	vinagre/vinagre-plugin-dialog.h \
 	vinagre/vinagre-window-private.h \
 	vinagre/pty_open.h
@@ -105,7 +104,6 @@ handwritten_sources = \
 	vinagre/vinagre-plugins-engine.c
 
 libvinagre_la_SOURCES = \
-	vinagre/vinagre-enums.c \
 	$(handwritten_sources) \
 	$(noinst_vinagreh_headers) \
 	$(vinagreh_HEADERS)
@@ -148,8 +146,6 @@ vinagre_applet_SOURCES = \
 	vinagre/vinagre-connection.c \
 	vinagre/vinagre-utils.h \
 	vinagre/vinagre-utils.c \
-	vinagre/vinagre-enums.h \
-	vinagre/vinagre-enums.c \
 	vinagre/vinagre-bookmarks-entry.h \
 	vinagre/vinagre-bookmarks-entry.c \
 	vinagre/vinagre-bookmarks-tree.h \
@@ -202,39 +198,6 @@ vinagre_applet_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[
 
 endif
 
-# Autogenerated stuff
-vinagre_enum_headers = $(top_srcdir)/vinagre/vinagre-connection.h
-
-vinagre/vinagre-enums.c: $(vinagre_enum_headers)
-	$(AM_V_GEN)$(GLIB_MKENUMS) --fhead "#include <glib-object.h>\n" \
-			--fhead "#include \"vinagre-enums.h\"\n\n" \
-			--fprod "\n/* enumerations from \"@filename \" */" \
-			--fprod "\n#include \"@filename \"\n" \
-			--vhead "static const G Type@Value _ enum_name@_values[] = {" \
-			--vprod "  { @VALUENAME@, \"@VALUENAME \", \"@valuenick \" }," \
-			--vtail "  { 0, NULL, NULL }\n};\n\n" \
-			--vtail "GType\n enum_name@_get_type (void)\n{\n" \
-			--vtail "  static GType type = 0;\n\n" \
-			--vtail "  if (!type)\n" \
-			--vtail "    type = g_ type@_register_static (\"@EnumName \", _ enum_name@_values);\n\n" \
-			--vtail "  return type;\n}\n\n" \
-		$(vinagre_enum_headers) > $@
-
-vinagre/vinagre-enums.h: $(vinagre_enum_headers)
-	$(AM_V_GEN)$(GLIB_MKENUMS) --fhead "#ifndef __VINAGRE_ENUMS_H__\n" \
-			--fhead "#define __VINAGRE_ENUMS_H__ 1\n\n" \
-			--fhead "G_BEGIN_DECLS\n\n" \
-			--ftail "G_END_DECLS\n\n" \
-			--ftail "#endif /* __VINAGRE_ENUMS_H__ */\n" \
-			--fprod "\n/* --- @filename@ --- */" \
-			--eprod "#define VINAGRE_TYPE_ ENUMSHORT@ @enum_name _get_type()\n" \
-			--eprod "GType @enum_name _get_type (void);\n" \
-		$(vinagre_enum_headers) >  $@
-
-BUILT_SOURCES = \
-	vinagre/vinagre-enums.c \
-	vinagre/vinagre-enums.h
-
 # Telepathy stuff
 if VINAGRE_HAVE_TELEPATHY_GLIB
 handwritten_sources += \
@@ -543,7 +506,6 @@ DISTCLEANFILES = \
 	intltool-extract \
 	intltool-merge \
 	intltool-update \
-	$(BUILT_SOURCES) \
 	$(server_in_files) \
 	$(server_DATA)
 
diff --git a/configure.ac b/configure.ac
index 73cab1d..6eb2fff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,13 +37,6 @@ GTK_VNC_DEPS="gtk-vnc-2.0 >= 0.4.3"
 XML2_DEPS="libxml-2.0 >= 2.6.31"
 PEAS_DEPS="libpeas-1.0 >= 0.7.2 libpeas-gtk-1.0 >= 0.7.2"
 
-AC_MSG_CHECKING([for glib-mkenums script])
-GLIB_MKENUMS=`$PKG_CONFIG --variable=glib_mkenums glib-2.0`
-AS_IF([test "x$GLIB_MKENUMS" = "x"],
-  [AC_MSG_ERROR([glib-mkenums not listed in glib-2.0 pkg-config file])],
-  [AC_SUBST([GLIB_MKENUMS])
-    AC_MSG_RESULT([$GLIB_MKENUMS])])
-
 # Whether to enable support for SSH.
 SSH_DEPS="vte-2.90 >= 0.20 $XML2_DEPS"
 
diff --git a/vinagre/vinagre-connection.c b/vinagre/vinagre-connection.c
index 9d19ef5..4f1eb09 100644
--- a/vinagre/vinagre-connection.c
+++ b/vinagre/vinagre-connection.c
@@ -24,7 +24,6 @@
 #include <gtk/gtk.h>
 
 #include "vinagre-connection.h"
-#include "vinagre-enums.h"
 #include "vinagre-bookmarks.h"
 #include "vinagre-plugins-engine.h"
 #include "vinagre-utils.h"



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]