AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Remove the deprecated gtkmarshal.* entirely

Browse Source
This commit is contained in:
Michael Natterer 2009-10-21 20:36:37 +02:00 committed by Javier Jardón
parent 5e29973773
commit f25e1b0a47
2 changed files with 1 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/Makefile.am
View File

@ -514,7 +514,6 @@ gtk_base_c_sources = \
gtklinkbutton.c \
gtkliststore.c \
gtkmain.c \
gtkmarshal.c \
gtkmarshalers.c \
gtkmenu.c \
gtkmenubar.c \
@ -737,7 +736,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
@ -752,13 +750,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
@ -772,8 +768,7 @@ gtk_extra_sources = \
gtkstatusicon-quartz.c \
gtk.symbols \
gtkversion.h.in \
gtkmarshalers.list \
gtkmarshal.list
gtkmarshalers.list
#
# setup GTK+ sources and their dependencies
@ -812,24 +807,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

36
gtk/gtkmarshal.list
View File

@ -1,36 +0,0 @@
BOOL:NONE
BOOL:POINTER
BOOL:POINTER,POINTER,INT,INT
BOOL:POINTER,INT,INT
BOOL:POINTER,INT,INT,UINT
BOOL:POINTER,STRING,STRING,POINTER
ENUM:ENUM
INT:POINTER
INT:POINTER,CHAR,CHAR
NONE:BOOL
NONE:BOXED
NONE:ENUM
NONE:ENUM,FLOAT
NONE:ENUM,FLOAT,BOOL
NONE:INT
NONE:INT,INT
NONE:INT,INT,POINTER
NONE:NONE
NONE:OBJECT
NONE:POINTER
NONE:POINTER,INT
NONE:POINTER,POINTER
NONE:POINTER,POINTER,POINTER
NONE:POINTER,STRING,STRING
NONE:POINTER,UINT
NONE:POINTER,UINT,ENUM
NONE:POINTER,POINTER,UINT,UINT
NONE:POINTER,INT,INT,POINTER,UINT,UINT
NONE:POINTER,UINT,UINT
NONE:POINTER,UINT,UINT
NONE:STRING
NONE:STRING,INT,POINTER
NONE:UINT
NONE:UINT,POINTER,UINT,ENUM,ENUM,POINTER
NONE:UINT,POINTER,UINT,UINT,ENUM
NONE:UINT,STRING