Pass $srcdir in environment to genmarshal.pl. Look for `gtkmarshal.list'

1998-06-09  Raja R Harinath  <harinath@cs.umn.edu>

	* gtk/Makefile.am (gtkmarshal.c gtkmarshal.h): Pass $srcdir in
	environment to genmarshal.pl.
	* gtk/genmarshal.pl: Look for `gtkmarshal.list' in $srcdir.

diff --git a/ChangeLog b/ChangeLog
index 0a90f2e8b4b96815ef2c1819897747f5654ff9ae..594d60053e9522bfbcfcbeff4a4fc8a35db9a34b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-06-09  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (gtkmarshal.c gtkmarshal.h): Pass $srcdir in
+       environment to genmarshal.pl.
+       * gtk/genmarshal.pl: Look for `gtkmarshal.list' in $srcdir.
+
 Tue Jun  9 18:44:57 1998  Owen Taylor  <otaylor@gtk.org>
 
        * gtk/gtkobject.c: Removed g_object_pointer_hash, which

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 0a90f2e8b4b96815ef2c1819897747f5654ff9ae..594d60053e9522bfbcfcbeff4a4fc8a35db9a34b 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+1998-06-09  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (gtkmarshal.c gtkmarshal.h): Pass $srcdir in
+       environment to genmarshal.pl.
+       * gtk/genmarshal.pl: Look for `gtkmarshal.list' in $srcdir.
+
 Tue Jun  9 18:44:57 1998  Owen Taylor  <otaylor@gtk.org>
 
        * gtk/gtkobject.c: Removed g_object_pointer_hash, which

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0a90f2e8b4b96815ef2c1819897747f5654ff9ae..594d60053e9522bfbcfcbeff4a4fc8a35db9a34b 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+1998-06-09  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (gtkmarshal.c gtkmarshal.h): Pass $srcdir in
+       environment to genmarshal.pl.
+       * gtk/genmarshal.pl: Look for `gtkmarshal.list' in $srcdir.
+
 Tue Jun  9 18:44:57 1998  Owen Taylor  <otaylor@gtk.org>
 
        * gtk/gtkobject.c: Removed g_object_pointer_hash, which

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 0a90f2e8b4b96815ef2c1819897747f5654ff9ae..594d60053e9522bfbcfcbeff4a4fc8a35db9a34b 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+1998-06-09  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (gtkmarshal.c gtkmarshal.h): Pass $srcdir in
+       environment to genmarshal.pl.
+       * gtk/genmarshal.pl: Look for `gtkmarshal.list' in $srcdir.
+
 Tue Jun  9 18:44:57 1998  Owen Taylor  <otaylor@gtk.org>
 
        * gtk/gtkobject.c: Removed g_object_pointer_hash, which

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 0a90f2e8b4b96815ef2c1819897747f5654ff9ae..594d60053e9522bfbcfcbeff4a4fc8a35db9a34b 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+1998-06-09  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (gtkmarshal.c gtkmarshal.h): Pass $srcdir in
+       environment to genmarshal.pl.
+       * gtk/genmarshal.pl: Look for `gtkmarshal.list' in $srcdir.
+
 Tue Jun  9 18:44:57 1998  Owen Taylor  <otaylor@gtk.org>
 
        * gtk/gtkobject.c: Removed g_object_pointer_hash, which

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 0a90f2e8b4b96815ef2c1819897747f5654ff9ae..594d60053e9522bfbcfcbeff4a4fc8a35db9a34b 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+1998-06-09  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (gtkmarshal.c gtkmarshal.h): Pass $srcdir in
+       environment to genmarshal.pl.
+       * gtk/genmarshal.pl: Look for `gtkmarshal.list' in $srcdir.
+
 Tue Jun  9 18:44:57 1998  Owen Taylor  <otaylor@gtk.org>
 
        * gtk/gtkobject.c: Removed g_object_pointer_hash, which

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0a90f2e8b4b96815ef2c1819897747f5654ff9ae..594d60053e9522bfbcfcbeff4a4fc8a35db9a34b 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+1998-06-09  Raja R Harinath  <harinath@cs.umn.edu>
+
+       * gtk/Makefile.am (gtkmarshal.c gtkmarshal.h): Pass $srcdir in
+       environment to genmarshal.pl.
+       * gtk/genmarshal.pl: Look for `gtkmarshal.list' in $srcdir.
+
 Tue Jun  9 18:44:57 1998  Owen Taylor  <otaylor@gtk.org>
 
        * gtk/gtkobject.c: Removed g_object_pointer_hash, which

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 43e75ffbddaaa4b5a1455261f163e3e30dba584b..a3df27371dfa2277101ac0963d656205fc6efc6b 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -324,4 +324,4 @@ test-debug: testgtk
        $(SHELL) $$top_builddir/libtool --mode=execute gdb $$builddir/testgtk
 
 gtkmarshal.c gtkmarshal.h: gtkmarshal.list
-       perl $(srcdir)/genmarshal.pl
+       srcdir=$(srcdir) perl $(srcdir)/genmarshal.pl

diff --git a/gtk/genmarshal.pl b/gtk/genmarshal.pl
index f1c76a986774a314135ed0e9451fcc81e9c6507e..7738ca05317b3d0217dbbcec7a92874171c18a7d 100755 (executable)
--- a/gtk/genmarshal.pl
+++ b/gtk/genmarshal.pl
@@ -13,7 +13,7 @@
           "ARGS"=>"gpointer", "SIGNAL"=>"gpointer",
           "C_CALLBACK"=>"gpointer");
 
-open(IL, "<gtkmarshal.list") || die("Open failed: $!");
+open(IL, "<".$ENV{'srcdir'}."/gtkmarshal.list") || die("Open failed: $!");
 open(OH, ">gtkmarshal.h") || die("Open failed: $!");
 open(OS, ">gtkmarshal.c") || die("Open failed: $!");