[Xfce4-commits] <libxfce4util:master> Don't generate enum types.

[Nick Schermer]

Updating branch refs/heads/master
         to 18fcca957cb117b19d2c6f33a5ece3e7e823ead9 (commit)
       from 5fa64704dbf6267faf32829188c07b04a6fe10ed (commit)

commit 18fcca957cb117b19d2c6f33a5ece3e7e823ead9
Author: Nick Schermer <nick at xfce.org>
Date:   Fri Jun 10 20:55:51 2011 +0200

    Don't generate enum types.
    
    As an extension library to glib, never generate enum
    that are no used by anyone.

 libxfce4util/Makefile.am          |   37 ++-----------------------------------
 libxfce4util/libxfce4util.h       |    1 -
 libxfce4util/libxfce4util.symbols |    8 --------
 3 files changed, 2 insertions(+), 44 deletions(-)

diff --git a/libxfce4util/Makefile.am b/libxfce4util/Makefile.am
index 0f3db3b..82425cd 100644
--- a/libxfce4util/Makefile.am
+++ b/libxfce4util/Makefile.am
@@ -31,14 +31,9 @@ libxfce4util_headers =							\
 	xfce-resource.h							\
 	xfce-utf8.h
 
-libxfce4util_built_public_sources =					\
-	libxfce4util-enum-types.h
-
 libxfce4util_built_sources =						\
-	$(libxfce4util_built_public_sources)				\
 	libxfce4util-alias.h						\
-	libxfce4util-aliasdef.c						\
-	libxfce4util-enum-types.c
+	libxfce4util-aliasdef.c
 
 libxfce4utilincludedir = $(includedir)/xfce4/libxfce4util
 libxfce4utilinclude_HEADERS =						\
@@ -95,12 +90,9 @@ pkgconfig_DATA = libxfce4util-1.0.pc
 if MAINTAINER_MODE
 CLEANFILES =								\
 	actual-abi							\
-	expected-abi							\
-	xgen-letc							\
-	xgen-leth
+	expected-abi
 
 DISTCLEANFILES =							\
-	stamp-libxfce4util-enum-types.h					\
 	$(libxfce4util_built_sources)
 
 BUILT_SOURCES =								\
@@ -111,31 +103,6 @@ libxfce4util-alias.h: make-libxfce4util-alias.pl libxfce4util.symbols
 
 libxfce4util-aliasdef.c: make-libxfce4util-alias.pl libxfce4util.symbols
 	$(AM_V_GEN) $(PERL) $(srcdir)/make-libxfce4util-alias.pl -def < $(srcdir)/libxfce4util.symbols > libxfce4util-aliasdef.c
-
-libxfce4util-enum-types.h: stamp-libxfce4util-enum-types.h
-	@true
-stamp-libxfce4util-enum-types.h: $(libxfce4util_headers) Makefile
-	$(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
-		--fhead "#ifndef __LIBXFCE4UTIL_ENUM_TYPES_H__\n#define __LIBXFCE4UTIL_ENUM_TYPES_H__\n#include <glib-object.h>\n" \
-		--fprod "/* enumerations from \"@filename@\" */\n" \
-		--vhead "GType @enum_name at _get_type (void) G_GNUC_CONST;\n#define XFCE_TYPE_ at ENUMSHORT@ (@enum_name at _get_type())\n" \
-		--ftail "#endif /* __LIBXFCE4UTIL_ENUM_TYPES_H__ */" \
-		$(libxfce4util_headers) ) > xgen-leth \
-	&& (cmp -s xgen-leth libxfce4util-enum-types.h || cp xgen-leth libxfce4util-enum-types.h) \
-	&& rm -f xgen-leth \
-	&& echo timestamp > $(@F)
-
-libxfce4util-enum-types.c: $(libxfce4util_headers) Makefile
-	$(AM_V_GEN) ( cd $(srcdir) && glib-mkenums \
-		--fhead "#include <libxfce4util/libxfce4util.h>\n#include <libxfce4util/libxfce4util-alias.h>\n" \
-		--fprod "\n/* enumerations from \"@filename@\" */" \
-		--vhead "GType\n at enum_name@_get_type (void)\n{\n  static GType etype = 0;\n  if (etype == 0) {\n    static const G at Type@Value values[] = {" \
-		--vprod "      { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \
-		--vtail "      { 0, NULL, NULL }\n    };\n    etype = g_ at type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
-		--ftail "\n#define __LIBXFCE4UTIL_ENUM_TYPES_C__\n#include <libxfce4util/libxfce4util-aliasdef.c>\n" \
-		$(libxfce4util_headers) ) >> xgen-letc \
-	&& cp xgen-letc libxfce4util-enum-types.c \
-	&& rm -f xgen-letc
 endif
 
 # required for gtk-doc
diff --git a/libxfce4util/libxfce4util.h b/libxfce4util/libxfce4util.h
index 0e9ec8c..b69dcfc 100644
--- a/libxfce4util/libxfce4util.h
+++ b/libxfce4util/libxfce4util.h
@@ -25,7 +25,6 @@
 #define LIBXFCE4UTIL_INSIDE_LIBXFCE4UTIL_H
 
 #include <libxfce4util/libxfce4util-config.h>
-#include <libxfce4util/libxfce4util-enum-types.h>
 
 #include <libxfce4util/debug.h>
 #include <libxfce4util/xfce-fileutils.h>
diff --git a/libxfce4util/libxfce4util.symbols b/libxfce4util/libxfce4util.symbols
index e40fa68..d0ecc33 100644
--- a/libxfce4util/libxfce4util.symbols
+++ b/libxfce4util/libxfce4util.symbols
@@ -45,14 +45,6 @@ libxfce4util_micro_version
 #endif
 #endif
 
-/* libxfce4util-enum-types functions */
-#if IN_HEADER(__LIBXFCE4UTIL_ENUM_TYPES_H__)
-#if IN_SOURCE(__LIBXFCE4UTIL_ENUM_TYPES_C__)
-xfce_license_text_type_get_type G_GNUC_CONST
-xfce_resource_type_get_type G_GNUC_CONST
-#endif
-#endif
-
 /* xfce-fileutils functions */
 #if IN_HEADER(__XFCE_FILEUTILS_H__)
 #if IN_SOURCE(__XFCE_FILEUTILS_C__)