fixups for glib-mkenums and glib-genmarshal (not tested yet because with

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
	atk, but it was broken anyway so this may help)

diff --git a/ChangeLog b/ChangeLog
index 3848e72803c9ee7bd6a89e76bc5ee456a9b00729..bdca3473d3277b32d7bd739f4825f321d2e26514 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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
+       atk, but it was broken anyway so this may help) 
+
 2001-06-07  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: output m4macros/Makefile

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3848e72803c9ee7bd6a89e76bc5ee456a9b00729..bdca3473d3277b32d7bd739f4825f321d2e26514 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+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
+       atk, but it was broken anyway so this may help) 
+
 2001-06-07  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: output m4macros/Makefile

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3848e72803c9ee7bd6a89e76bc5ee456a9b00729..bdca3473d3277b32d7bd739f4825f321d2e26514 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+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
+       atk, but it was broken anyway so this may help) 
+
 2001-06-07  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: output m4macros/Makefile

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3848e72803c9ee7bd6a89e76bc5ee456a9b00729..bdca3473d3277b32d7bd739f4825f321d2e26514 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+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
+       atk, but it was broken anyway so this may help) 
+
 2001-06-07  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: output m4macros/Makefile

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3848e72803c9ee7bd6a89e76bc5ee456a9b00729..bdca3473d3277b32d7bd739f4825f321d2e26514 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+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
+       atk, but it was broken anyway so this may help) 
+
 2001-06-07  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: output m4macros/Makefile

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3848e72803c9ee7bd6a89e76bc5ee456a9b00729..bdca3473d3277b32d7bd739f4825f321d2e26514 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+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
+       atk, but it was broken anyway so this may help) 
+
 2001-06-07  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: output m4macros/Makefile

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3848e72803c9ee7bd6a89e76bc5ee456a9b00729..bdca3473d3277b32d7bd739f4825f321d2e26514 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+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
+       atk, but it was broken anyway so this may help) 
+
 2001-06-07  Havoc Pennington  <hp@redhat.com>
 
        * configure.in: output m4macros/Makefile

diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 1f5dcd6fbb310b05cfa1d69aa524e3617ef17f1d..c816f783dfbb699348eb90469fecaf311b645afe 100644 (file)
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,3 +1,7 @@
+2001-06-07  Havoc Pennington  <hp@redhat.com>
+
+       * Makefile.am (gdk-pixbuf-marshal.c): fix up the glib-genmarshal path
+
 2001-06-05  Havoc Pennington  <hp@redhat.com>
 
        * test-loaders.c (main): use putenv not setenv, reported by 

diff --git a/gdk-pixbuf/Makefile.am b/gdk-pixbuf/Makefile.am
index 2c873bfa5965ce8be93db50fda000e55d0267ab2..a26cfebaa6628d9e8e34132c4d5bb56238a4ff12 100644 (file)
--- a/gdk-pixbuf/Makefile.am
+++ b/gdk-pixbuf/Makefile.am
@@ -241,15 +241,21 @@ EXTRA_DIST =                      \
 
 
 gdk-pixbuf-marshal.h: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
-       cwd=`pwd` \
-       && cd $(srcdir) \
-       && $$cwd/@GLIB_GENMARSHAL@ --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >> xgen-gmh \
+        case @GLIB_GENMARSHAL@ in                                                      \
+           /*) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                    \
+            *) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;;                \
+        esac;                                                                          \
+       cd $(srcdir) \
+       && $$glib_genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --header >> xgen-gmh \
        && (cmp -s xgen-gmh gdk-pixbuf-marshal.h || cp xgen-gmh gdk-pixbuf-marshal.h) \
        && rm -f xgen-gmh xgen-gmh~
 
 gdk-pixbuf-marshal.c: @REBUILD@ $(srcdir)/gdk-pixbuf-marshal.list
-       cwd=`pwd` \
+        case @GLIB_GENMARSHAL@ in                                                      \
+           /*) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                    \
+            *) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;;                \
+        esac;                                                                          \
        && cd $(srcdir) \
-       && $$cwd/@GLIB_GENMARSHAL@ --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >> xgen-gmc \
+       && $$glib-genmarshal --prefix=gdk_pixbuf_marshal gdk-pixbuf-marshal.list --body >> xgen-gmc \
        && (cmp -s xgen-gmc gdk-pixbuf-marshal.c || cp xgen-gmc gdk-pixbuf-marshal.c) \
        && rm -f xgen-gmc xgen-gmc~

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 16a226141234519ce4b0f73e3d840dd2009eb7ec..d739526645531d3e5f612c86746b096e26e7fe53 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -429,9 +429,12 @@ 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)
-       cwd=`pwd` \
-       && cd $(srcdir) \
-       && $$cwd/@GLIB_MKENUMS@ --comments ";; @comment@" \
+        case @GLIB_MKENUMS@ in                                                 \
+           /*) glib_mkenums=@GLIB_MKENUMS@ ;;                                  \
+            *) glib_mkenums=`cd $(top_builddir) && pwd`/@GLIB_MKENUMS@ ;;      \
+        esac;                                                                  \
+       cd $(srcdir) \
+       && $$glib_mkenums --comments ";; @comment@" \
                        --fprod "; enumerations from \"@filename@\"\n " \
                        --vhead "(define-@type@ @EnumName@" \
                        --vprod "   (@valuenick@ @VALUENAME@)" \
@@ -442,16 +445,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
-       cwd=`pwd` \
-       && cd $(srcdir) \
-       && $$cwd/@GLIB_GENMARSHAL@ --prefix=gtk_marshal gtkmarshal.list --header >> xgen-gmh \
+        case @GLIB_GENMARSHAL@ in                                                      \
+           /*) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                    \
+            *) glib_genmarshal=`cd $(top_builddir) && pwd`/@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
-       cwd=`pwd` \
-       && cd $(srcdir) \
-       && $$cwd/@GLIB_GENMARSHAL@ --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \
+        case @GLIB_GENMARSHAL@ in                                                      \
+           /*) glib_genmarshal=@GLIB_GENMARSHAL@ ;;                                    \
+            *) glib_genmarshal=`cd $(top_builddir) && pwd`/@GLIB_GENMARSHAL@ ;;                \
+        esac;                                                                          \
+       && $$glib_genmarshal --prefix=gtk_marshal gtkmarshal.list --body >> xgen-gmc \
        && cp xgen-gmc $(srcdir)/gtkmarshal.c \
        && rm -f xgen-gmc xgen-gmc~
 $(srcdir)/stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk $(srcdir)/stamp-gtk.defs gtktypebuiltins.h
@@ -471,9 +479,12 @@ $(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)
-       cwd=`pwd` \
-       && cd $(srcdir) \
-       && $$cwd/@GLIB_MKENUMS@ \
+        case @GLIB_MKENUMS@ in                                                 \
+           /*) glib_mkenums=@GLIB_MKENUMS@ ;;                                  \
+            *) glib_mkenums=`cd $(top_builddir) && pwd`/@GLIB_MKENUMS@ ;;      \
+        esac;                                                                  \
+       cd $(srcdir) \
+       && $$glib_mkenums \
                        --fprod "\n/* enumerations from \"@filename@\" */" \
                        --vhead "static const GtkEnumValue _@enum_name@_values[] = {" \
                        --vprod "  { @VALUENAME@, \"@VALUENAME@\", \"@valuenick@\" }," \