[gtk+/gtk-2-90: 108/161] Remove the deprecated gtkmarshal.* entirely
- From: Javier Jardón <jjardon src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/gtk-2-90: 108/161] Remove the deprecated gtkmarshal.* entirely
- Date: Tue, 23 Mar 2010 21:12:35 +0000 (UTC)
commit c2b5c035ca3b52abf1671504a7458fcb2af4c481
Author: Michael Natterer <mitch gimp org>
Date: Wed Oct 21 20:36:37 2009 +0200
Remove the deprecated gtkmarshal.* entirely
gtk/Makefile.am | 25 +------------------------
gtk/gtkmarshal.list | 36 ------------------------------------
2 files changed, 1 insertions(+), 60 deletions(-)
---
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index f42daca..8be15d6 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -512,7 +512,6 @@ gtk_base_c_sources = \
gtklinkbutton.c \
gtkliststore.c \
gtkmain.c \
- gtkmarshal.c \
gtkmarshalers.c \
gtkmenu.c \
gtkmenubar.c \
@@ -735,7 +734,6 @@ EXTRA_DIST += gtkquartz.h
# built sources that get installed with the header files
gtk_built_public_sources = \
- gtkmarshal.h \
gtktypebuiltins.h
# built headers that don't get installed
@@ -750,13 +748,11 @@ gtk_built_sources = \
gtktypebuiltins.c \
gtktypefuncs.c \
gtkmarshalers.c \
- gtkmarshal.c \
${gtk_built_private_headers} \
${gtk_built_public_sources}
stamp_files = \
stamp-gtkmarshalers.h \
- stamp-gtkmarshal.h \
stamp-gtktypebuiltins.h \
stamp-icons
@@ -770,8 +766,7 @@ gtk_extra_sources = \
gtkstatusicon-quartz.c \
gtk.symbols \
gtkversion.h.in \
- gtkmarshalers.list \
- gtkmarshal.list
+ gtkmarshalers.list
#
# setup GTK+ sources and their dependencies
@@ -810,24 +805,6 @@ gtkmarshalers.c: @REBUILD@ gtkmarshalers.list
&& cp xgen-gmlc gtkmarshalers.c \
&& rm -f xgen-gmlc
-gtkmarshal.h: stamp-gtkmarshal.h
- @true
-stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list
- echo "#ifndef GTK_DISABLE_DEPRECATED" > xgen-gmh \
- && $(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --header >> xgen-gmh \
- && echo "#endif /* GTK_DISABLE_DEPRECATED */" >> xgen-gmh \
- && (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \
- && rm -f xgen-gmh \
- && echo timestamp > $(@F)
-gtkmarshal.c: @REBUILD@ gtkmarshal.list
- (echo "#include \"gtkmarshal.h\""; \
- echo "#include \"gtkalias.h\""; \
- $(GLIB_GENMARSHAL) --prefix=gtk_marshal $(srcdir)/gtkmarshal.list --body; \
- echo "#define __gtk_marshal_MARSHAL_C__"; \
- echo "#include \"gtkaliasdef.c\"") >> xgen-gmc \
- && cp xgen-gmc gtkmarshal.c \
- && rm -f xgen-gmc
-
gtktypebuiltins.h: stamp-gtktypebuiltins.h
@true
stamp-gtktypebuiltins.h: @REBUILD@ $(gtk_public_h_sources) gtktypebuiltins.h.template
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]