[eog] Unexport generated symbols



commit 69480c95a84bd7aa1b4e553d4c1d782467c0a78d
Author: Felix Riemann <friemann svn gnome org>
Date:   Wed Apr 22 15:50:29 2009 +0200

    Unexport generated symbols
    
    Mark generated marshallers and enum types as internal to eog.
    They aren't available to plugins anyway and thus the executable
    doesn't need to export them.
---
 ChangeLog                              |    7 +++++++
 cut-n-paste/toolbar-editor/Makefile.am |    6 +++---
 src/Makefile.am                        |    2 +-
 src/eog-enum-types.h.template          |    2 +-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9b46fff..2400da4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-04-22  Felix Riemann  <friemann svn gnome org>
+
+	* src/Makefile.am:
+	* src/eog-enum-types.h.template:
+	* cut-n-paste/toolbar-editor/Makefile.am:
+	Don't export generated marshaller and enum symbols.
+
 2009-04-18  Felix Riemann  <friemann svn gnome org>
 
 	* src/eog-uri-converter.c (eog_uri_converter_get_property):
diff --git a/cut-n-paste/toolbar-editor/Makefile.am b/cut-n-paste/toolbar-editor/Makefile.am
index 2db4e4e..338d569 100644
--- a/cut-n-paste/toolbar-editor/Makefile.am
+++ b/cut-n-paste/toolbar-editor/Makefile.am
@@ -46,7 +46,7 @@ stamp_files = \
 eggmarshalers.h: stamp-eggmarshalers.h
 	@true
 stamp-eggmarshalers.h: eggmarshalers.list
-	$(GLIB_GENMARSHAL) --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header > eggmarshalers.h \
+	$(GLIB_GENMARSHAL) --internal --prefix=_egg_marshal $(srcdir)/eggmarshalers.list --header > eggmarshalers.h \
 	&& echo timestamp > $(@F)
 
 eggmarshalers.c: stamp-eggmarshalers.c
@@ -65,7 +65,7 @@ stamp-eggtypebuiltins.c: $(EGGHEADERS)
 		--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 "G_GNUC_INTERNAL GType\n enum_name@_get_type (void)\n{\n" \
 		--vtail "  static GType type = 0;\n\n" \
 		--vtail "  if (G_UNLIKELY (type == 0))\n" \
 		--vtail "    type = g_ type@_register_static (\"@EnumName \", _ enum_name@_values);\n\n" \
@@ -87,7 +87,7 @@ stamp-eggtypebuiltins.h: $(EGGHEADERS)
 		--ftail "#endif /* __EGGTYPEBUILTINS_H__ */\n" \
 		--fprod "\n/* --- @filename@ --- */" \
 		--eprod "#define EGG_TYPE_ ENUMSHORT@ @enum_name _get_type()\n" \
-		--eprod "GType @enum_name _get_type (void);\n" \
+		--eprod "G_GNUC_INTERNAL GType @enum_name _get_type (void);\n" \
 		$(^F) ) > xgen-$(@F) \
 	&& ( cmp -s xgen-$(@F) $(@F:stamp-%=%) || cp xgen-$(@F) $(@F:stamp-%=%) ) \
 	&& rm -f xgen-$(@F) \
diff --git a/src/Makefile.am b/src/Makefile.am
index 94a974b..df34146 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -200,7 +200,7 @@ eog-enum-types.c: eog-enum-types.c.template $(INST_H_FILES) $(GLIB_MKENUMS)
 	(cd $(srcdir) && $(GLIB_MKENUMS) --template eog-enum-types.c.template $(INST_H_FILES)) > $@
 
 eog-marshal.h: eog-marshal.list $(GLIB_GENMARSHAL)
-	$(GLIB_GENMARSHAL) $< --header --prefix=eog_marshal > $@
+	$(GLIB_GENMARSHAL) $< --header --internal --prefix=eog_marshal > $@
 
 eog-marshal.c: eog-marshal.list $(GLIB_GENMARSHAL)
 	$(GLIB_GENMARSHAL) $< --body --header --prefix=eog_marshal > $@
diff --git a/src/eog-enum-types.h.template b/src/eog-enum-types.h.template
index c63c78c..c08bb83 100644
--- a/src/eog-enum-types.h.template
+++ b/src/eog-enum-types.h.template
@@ -15,7 +15,7 @@ G_BEGIN_DECLS
 
 /*** BEGIN enumeration-production ***/
 #define EOG_TYPE_ ENUMSHORT@	(@enum_name _get_type())
-GType @enum_name _get_type	(void) G_GNUC_CONST;
+G_GNUC_INTERNAL GType @enum_name _get_type	(void) G_GNUC_CONST;
 
 /*** END enumeration-production ***/
 



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