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

fix glib-mkenums and glib-genmarshal again

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

	* gtk/Makefile.am: fix glib-mkenums and glib-genmarshal again
This commit is contained in:
Havoc Pennington 2001-06-07 22:01:26 +00:00 committed by Havoc Pennington
parent 8cd9e49682
commit 10b868ebae
8 changed files with 46 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
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> 2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal * gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal

4
ChangeLog.pre-2-0
View File

@ -1,3 +1,7 @@
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> 2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal * gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal

4
ChangeLog.pre-2-10
View File

@ -1,3 +1,7 @@
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> 2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal * gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal

4
ChangeLog.pre-2-2
View File

@ -1,3 +1,7 @@
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> 2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal * gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal

4
ChangeLog.pre-2-4
View File

@ -1,3 +1,7 @@
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> 2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal * gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal

4
ChangeLog.pre-2-6
View File

@ -1,3 +1,7 @@
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> 2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal * gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal

4
ChangeLog.pre-2-8
View File

@ -1,3 +1,7 @@
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> 2001-06-07 Havoc Pennington <hp@redhat.com>
* gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal * gtk/Makefile.am: fixups for glib-mkenums and glib-genmarshal

36
gtk/Makefile.am
View File

@ -429,12 +429,11 @@ gtk.defs gtkmarshal.h gtktypebuiltins.h: # never add deps here
# srcdir to be writable, passing --disable-rebuilds to # srcdir to be writable, passing --disable-rebuilds to
# ../configure will supress all autogeneration rules. # ../configure will supress all autogeneration rules.
$(srcdir)/stamp-gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources) $(srcdir)/stamp-gtk.defs: @REBUILD@ gtk.defs gtk-boxed.defs $(gtk_public_h_sources)
case @GLIB_MKENUMS@ in \ case @GLIB_MKENUMS@ in \
/*) glib_mkenums=@GLIB_MKENUMS@ ;; \ .*) glib_mkenums=`cd $(top_builddir) && pwd`/@GLIB_MKENUMS@ ;; \
*) glib_mkenums=`cd $(top_builddir) && pwd`/@GLIB_MKENUMS@ ;; \ *) glib_mkenums=@GLIB_MKENUMS@ ;; \
esac; \ esac; \
cd $(srcdir) \ $$glib_mkenums --comments ";; @comment@" \
&& $$glib_mkenums --comments ";; @comment@" \
--fprod "; enumerations from \"@filename@\"\n " \ --fprod "; enumerations from \"@filename@\"\n " \
--vhead "(define-@type@ @EnumName@" \ --vhead "(define-@type@ @EnumName@" \
--vprod " (@valuenick@ @VALUENAME@)" \ --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 \ && rm -f xgen-gdef \
&& echo timestamp > $(@F) && echo timestamp > $(@F)
$(srcdir)/stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list gtkmarshal.h $(srcdir)/stamp-gtkmarshal.h: @REBUILD@ gtkmarshal.list gtkmarshal.h
case @GLIB_GENMARSHAL@ in \ case @GLIB_GENMARSHAL@ in \
/*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ .*) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \ *) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
esac; \ esac; \
cd $(srcdir) \ cd $(srcdir) \
&& $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh \ && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh \
&& (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \ && (cmp -s xgen-gmh gtkmarshal.h || cp xgen-gmh gtkmarshal.h) \
&& rm -f xgen-gmh xgen-gmh~ \ && rm -f xgen-gmh xgen-gmh~ \
&& echo timestamp > $(@F) && echo timestamp > $(@F)
$(srcdir)/gtkmarshal.c: @REBUILD@ $(srcdir)/stamp-gtkmarshal.h $(srcdir)/gtkmarshal.c: @REBUILD@ $(srcdir)/stamp-gtkmarshal.h
case @GLIB_GENMARSHAL@ in \ case @GLIB_GENMARSHAL@ in \
/*) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \ .*) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \
*) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;; \ *) glib_genmarshal=@GLIB_GENMARSHAL@ ;; \
esac; \ esac; \
cd $(srcdir) \
&& $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \ && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \
&& cp xgen-gmc $(srcdir)/gtkmarshal.c \ && cp xgen-gmc $(srcdir)/gtkmarshal.c \
&& rm -f xgen-gmc xgen-gmc~ && 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) \ && cp xgen-gtbic $(@F) \
&& rm -f xgen-gtbic && rm -f xgen-gtbic
$(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ $(gtk_public_h_sources) $(srcdir)/gtktypebuiltins_evals.c: @REBUILD@ $(gtk_public_h_sources)
case @GLIB_MKENUMS@ in \ case @GLIB_MKENUMS@ in \
/*) glib_mkenums=@GLIB_MKENUMS@ ;; \ .*) glib_mkenums=`cd $(top_builddir) && pwd`/@GLIB_MKENUMS@ ;; \
*) glib_mkenums=`cd $(top_builddir) && pwd`/@GLIB_MKENUMS@ ;; \ *) glib_mkenums=@GLIB_MKENUMS@ ;; \
esac; \ esac; \
cd $(srcdir) \ cd $(srcdir) \
&& $$glib_mkenums \ && $$glib_mkenums \
--fprod "\n/* enumerations from \"@filename@\" */" \ --fprod "\n/* enumerations from \"@filename@\" */" \