Commit 10b868eb authored by Havoc Pennington's avatar Havoc Pennington Committed by Havoc Pennington

fix glib-mkenums and glib-genmarshal again

2001-06-07  Havoc Pennington  <hp@redhat.com>

	* gtk/Makefile.am: fix glib-mkenums and glib-genmarshal again
parent 8cd9e496
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fix glib-mkenums and glib-genmarshal again
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal
......
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fix glib-mkenums and glib-genmarshal again
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal
......
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fix glib-mkenums and glib-genmarshal again
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal
......
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fix glib-mkenums and glib-genmarshal again
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal
......
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fix glib-mkenums and glib-genmarshal again
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal
......
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fix glib-mkenums and glib-genmarshal again
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal
......
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fix glib-mkenums and glib-genmarshal again
2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal
......
......@@ -429,12 +429,11 @@ gtk.defs gtkmarshal.h gtktypebuiltins.h: # never add deps here
# srcdir to be writable, passing --disable-rebuilds to
# ../configure will supress all autogeneration rules.
$(srcdir)/stamp-gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources)
case @GLIB_MKENUMS@ in \
/*) glib_mkenums=@GLIB_MKENUMS@ ;; \
*) glib_mkenums=`cd $(top_builddir) && pwd`/@GLIB_MKENUMS@ ;; \
esac; \
cd $(srcdir) \
&& $$glib_mkenums --comments ";; @comment@" \
case @GLIB_MKENUMS@ in \
.*) glib_mkenums=`cd $(top_builddir) && pwd`/@GLIB_MKENUMS@ ;; \
*) glib_mkenums=@GLIB_MKENUMS@ ;; \
esac; \
$$glib_mkenums --comments ";; @comment@" \
--fprod "; enumerations from \"@filename@\"\n " \
--vhead "(define-@type@ @EnumName@" \
--vprod " (@valuenick@ @VALUENAME@)" \
......@@ -445,20 +444,21 @@ $(srcdir)/stamp-gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sourc
&& rm -f xgen-gdef \
&& echo timestamp > $(@F)
$(srcdir)/stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list gtkmarshal.h
case @GLIB_GENMARSHAL@ in \
/*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \
esac; \
case @GLIB_GENMARSHAL@ in \
.*) glib_genmarshal=`cd $(top_builddir) && 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~ \
&& echo timestamp > $(@F)
$(srcdir)/gtkmarshal.c: @REBUILD@ $(srcdir)/stamp-gtkmarshal.h
case @GLIB_GENMARSHAL@ in \
/*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \
esac; \
case @GLIB_GENMARSHAL@ in \
.*) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
esac; \
cd $(srcdir) \
&& $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \
&& cp xgen-gmc $(srcdir)/gtkmarshal.c \
&& rm -f xgen-gmc xgen-gmc~
......@@ -479,10 +479,10 @@ $(srcdir)/gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.def
&& cp xgen-gtbic $(@F) \
&& rm -f xgen-gtbic
$(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ $(gtk_public_h_sources)
case @GLIB_MKENUMS@ in \
/*) glib_mkenums=@GLIB_MKENUMS@ ;; \
*) glib_mkenums=`cd $(top_builddir) && pwd`/@GLIB_MKENUMS@ ;; \
esac; \
case @GLIB_MKENUMS@ in \
.*) glib_mkenums=`cd $(top_builddir) && pwd`/@GLIB_MKENUMS@ ;; \
*) glib_mkenums=@GLIB_MKENUMS@ ;; \
esac; \
cd $(srcdir) \
&& $$glib_mkenums \
--fprod "\n/* enumerations from \"@filename@\" */" \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment