diff options
| author | Owen Taylor <otaylor@redhat.com> | 2001-11-17 23:28:51 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2001-11-17 23:28:51 +0000 |
| commit | a036c6e59f27ce53950c64a7672fa2cf51b21f19 (patch) | |
| tree | 0518e9cea97df1e5d4aeca65be4d2ccc95a5447d /gtk/Makefile.am | |
| parent | 3a3468024984ecb9617af5422c76e5a57240c9d0 (diff) | |
| download | gtk+-a036c6e59f27ce53950c64a7672fa2cf51b21f19.tar.gz | |
Make gtkmarshal.list/gtkmarshal.h only for compatibility with GTK+-1.2;
Sat Nov 17 18:26:45 2001 Owen Taylor <otaylor@redhat.com>
* gtk/Makefile.am gtk/gtkmarshal.list gtk/gtkmarshalers.list
gtk/*.c gtk/gtksignal.h: Make gtkmarshal.list/gtkmarshal.h
only for compatibility with GTK+-1.2; and deprecate it;
put all marshalers we actually use into gtkmarshalers.list
and use the _gtk_marshal_ prefix for these marshalers.
Diffstat (limited to 'gtk/Makefile.am')
| -rw-r--r-- | gtk/Makefile.am | 66 |
1 files changed, 46 insertions, 20 deletions
diff --git a/gtk/Makefile.am b/gtk/Makefile.am index bbe5fa6fe2..27d9e4bd35 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -313,6 +313,8 @@ gtk_c_sources = @STRIP_BEGIN@ \ gtklistitem.c \ gtkliststore.c \ gtkmain.c \ + gtkmarshalers.c \ + gtkmarshal.c \ gtkmenu.c \ gtkmenubar.c \ gtkmenuitem.c \ @@ -418,10 +420,12 @@ gtk_built_public_sources = @STRIP_BEGIN@ \ gtk_built_sources = @STRIP_BEGIN@ \ stamp-gtk.defs \ stamp-gtktypebuiltins.h \ - stamp-gtkmarshal.h \ + stamp-gtkmarshalers.h \ gtktypebuiltins_vars.c \ gtktypebuiltins_ids.c \ gtktypebuiltins_evals.c \ + gtkmarshalers.c \ + gtkmarshalers.h \ gtkmarshal.c \ gtk.defs \ ${gtk_built_public_sources} \ @@ -434,7 +438,7 @@ gtk_extra_sources = @STRIP_BEGIN@ \ maketypes.awk \ makeenums.h \ gtk-boxed.defs \ - gtkmarshal.list \ + gtkmarshalers.list \ @STRIP_END@ # @@ -457,7 +461,7 @@ Makefile: oldest-source-stamp # oh boy, does automake SUCK! oldest-source-stamp: $(gtk_built_sources) $(OBJECTS): oldest-source-stamp ${gtk_built_public_sources} # this is our oldest file, used for implicit auto-generation deps # initial creation of the real stamp-* files -gtk.defs gtkmarshal.h gtktypebuiltins.h: # never add deps here +gtk.defs gtkmarshalers.h gtktypebuiltins.h: # never add deps here test -f "$(srcdir)/$@" || touch $(srcdir)/$@ # normal autogeneration rules # all autogenerated files need to be generated in the srcdir, @@ -481,25 +485,47 @@ $(srcdir)/stamp-gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sourc && (cmp -s xgen-gdef gtk.defs || cp xgen-gdef gtk.defs) \ && rm -f xgen-gdef \ && echo timestamp > $(@F) -$(srcdir)/stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list gtkmarshal.h - case @GLIB_GENMARSHAL@ in \ - .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \ - *) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ - esac; \ - cd $(srcdir) \ - && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh \ - && (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \ - && rm -f xgen-gmh xgen-gmh~ \ + +$(srcdir)/stamp-gtkmarshalers.h: @REBUILD@ gtkmarshalers.list gtkmarshalers.h + case @GLIB_GENMARSHAL@ in \ + .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \ + *) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ + esac; \ + cd $(srcdir) \ + && $$glib_genmarshal --prefix=_gtk_marshal gtkmarshalers.list --header >> xgen-gmh \ + && (cmp -s xgen-gmh gtkmarshalers.h || cp xgen-gmh gtkmarshalers.h) \ + && rm -f xgen-gmh xgen-gmh~ \ && echo timestamp > $(@F) -$(srcdir)/gtkmarshal.c: @REBUILD@ $(srcdir)/stamp-gtkmarshal.h - case @GLIB_GENMARSHAL@ in \ - .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \ - *) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ - esac; \ - cd $(srcdir) \ - && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \ - && cp xgen-gmc gtkmarshal.c \ +$(srcdir)/gtkmarshalers.c: @REBUILD@ $(srcdir)/stamp-gtkmarshalers.h + case @GLIB_GENMARSHAL@ in \ + .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \ + *) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ + esac; \ + cd $(srcdir) \ + && $$glib_genmarshal --prefix=_gtk_marshal gtkmarshalers.list --body >> xgen-gmc \ + && cp xgen-gmc gtkmarshalers.c \ && rm -f xgen-gmc xgen-gmc~ +$(srcdir)/gtkmarshal.h: @REBUILD@ gtkmarshal.list + case @GLIB_GENMARSHAL@ in \ + .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \ + *) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ + esac; \ + cd $(srcdir) \ + && echo "#ifndef GTK_DISABLE_DEPRECATED" > xgen-gmh \ + && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh \ + && echo "#endif /* GTK_DISABLE_DEPRECATED */" >> xgen-gmh \ + && cp xgen-gmh gtkmarshal.h \ + && rm -f xgen-gmh xgen-gmh~ +$(srcdir)/gtkmarshal.c: @REBUILD@ gtkmarshal.h + case @GLIB_GENMARSHAL@ in \ + .*) glib_genmarshal=`pwd`/@GLIB_GENMARSHAL@ ;; \ + *) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ + esac; \ + cd $(srcdir) \ + && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \ + && cp xgen-gmc gtkmarshal.c \ + && rm -f xgen-gmc xgen-gmc~ + $(srcdir)/stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs gtktypebuiltins.h cd $(srcdir) \ && LC_ALL=C $(AWK) -f maketypes.awk gtk.defs macros > xgen-gtbh \ |