diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-0 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 4 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 4 | ||||
| -rw-r--r-- | gtk/Makefile.am | 36 |
8 files changed, 46 insertions, 18 deletions
@@ -1,4 +1,8 @@ 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 (not tested yet because with absolute path to srcdir I can't build diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bdca3473d3..5b4b060260 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,4 +1,8 @@ 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 (not tested yet because with absolute path to srcdir I can't build diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bdca3473d3..5b4b060260 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,4 +1,8 @@ 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 (not tested yet because with absolute path to srcdir I can't build diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bdca3473d3..5b4b060260 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,4 +1,8 @@ 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 (not tested yet because with absolute path to srcdir I can't build diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bdca3473d3..5b4b060260 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,4 +1,8 @@ 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 (not tested yet because with absolute path to srcdir I can't build diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bdca3473d3..5b4b060260 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,4 +1,8 @@ 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 (not tested yet because with absolute path to srcdir I can't build diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bdca3473d3..5b4b060260 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,4 +1,8 @@ 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 (not tested yet because with absolute path to srcdir I can't build diff --git a/gtk/Makefile.am b/gtk/Makefile.am index d739526645..5a29d9568b 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -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@\" */" \ |