From 54b231b03444cba5c5077c7b844e34373b666176 Mon Sep 17 00:00:00 2001 From: Raja R Harinath Date: Fri, 30 Jul 1999 17:12:48 +0000 Subject: [PATCH] Don't `mv' from builddir to srcdir, use `cp' followed by `rm' (the `rm' * gtk/Makefile.am (stamp-m): Don't `mv' from builddir to srcdir, use `cp' followed by `rm' (the `rm' was already there). --- ChangeLog | 20 +++++++++++++------- ChangeLog.pre-2-0 | 20 +++++++++++++------- ChangeLog.pre-2-10 | 20 +++++++++++++------- ChangeLog.pre-2-2 | 20 +++++++++++++------- ChangeLog.pre-2-4 | 20 +++++++++++++------- ChangeLog.pre-2-6 | 20 +++++++++++++------- ChangeLog.pre-2-8 | 20 +++++++++++++------- gtk/Makefile.am | 4 ++-- 8 files changed, 93 insertions(+), 51 deletions(-) diff --git a/ChangeLog b/ChangeLog index c2057099fa..cffc14d665 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,11 +1,17 @@ +1999-07-30 Raja R Harinath + + * gtk/Makefile.am (stamp-m): Don't `mv' from builddir to srcdir, + use `cp' followed by `rm' (the `rm' was already there). + July 30, 1999 Elliot Lee - . configure.in: Fix autoconf warnings about cross compilation by trying to - provide sane defaults for AC_TRY_RUN. - . docs/Makefile.am: Tell distcheck how to generate the .gif files. - . gtk/Makefile.am: If we refer to gtkmarshal.[ch] in $(srcdir), put them into - $(srcdir) when generated. Also add a dependency of gtksignal.h on gtkmarshal.h - for -j builds. - . gtk/gtk(dnd,style,gamma).c: Minor warning fixes. + + * configure.in: Fix autoconf warnings about cross compilation by + trying to provide sane defaults for AC_TRY_RUN. + * docs/Makefile.am: Tell distcheck how to generate the .gif files. + * gtk/Makefile.am: If we refer to gtkmarshal.[ch] in $(srcdir), + put them into $(srcdir) when generated. Also add a dependency of + gtksignal.h on gtkmarshal.h for -j builds. + * gtk/gtk(dnd,style,gamma).c: Minor warning fixes. Wed Jul 28 09:29:19 1999 Owen Taylor diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index c2057099fa..cffc14d665 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,11 +1,17 @@ +1999-07-30 Raja R Harinath + + * gtk/Makefile.am (stamp-m): Don't `mv' from builddir to srcdir, + use `cp' followed by `rm' (the `rm' was already there). + July 30, 1999 Elliot Lee - . configure.in: Fix autoconf warnings about cross compilation by trying to - provide sane defaults for AC_TRY_RUN. - . docs/Makefile.am: Tell distcheck how to generate the .gif files. - . gtk/Makefile.am: If we refer to gtkmarshal.[ch] in $(srcdir), put them into - $(srcdir) when generated. Also add a dependency of gtksignal.h on gtkmarshal.h - for -j builds. - . gtk/gtk(dnd,style,gamma).c: Minor warning fixes. + + * configure.in: Fix autoconf warnings about cross compilation by + trying to provide sane defaults for AC_TRY_RUN. + * docs/Makefile.am: Tell distcheck how to generate the .gif files. + * gtk/Makefile.am: If we refer to gtkmarshal.[ch] in $(srcdir), + put them into $(srcdir) when generated. Also add a dependency of + gtksignal.h on gtkmarshal.h for -j builds. + * gtk/gtk(dnd,style,gamma).c: Minor warning fixes. Wed Jul 28 09:29:19 1999 Owen Taylor diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c2057099fa..cffc14d665 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,11 +1,17 @@ +1999-07-30 Raja R Harinath + + * gtk/Makefile.am (stamp-m): Don't `mv' from builddir to srcdir, + use `cp' followed by `rm' (the `rm' was already there). + July 30, 1999 Elliot Lee - . configure.in: Fix autoconf warnings about cross compilation by trying to - provide sane defaults for AC_TRY_RUN. - . docs/Makefile.am: Tell distcheck how to generate the .gif files. - . gtk/Makefile.am: If we refer to gtkmarshal.[ch] in $(srcdir), put them into - $(srcdir) when generated. Also add a dependency of gtksignal.h on gtkmarshal.h - for -j builds. - . gtk/gtk(dnd,style,gamma).c: Minor warning fixes. + + * configure.in: Fix autoconf warnings about cross compilation by + trying to provide sane defaults for AC_TRY_RUN. + * docs/Makefile.am: Tell distcheck how to generate the .gif files. + * gtk/Makefile.am: If we refer to gtkmarshal.[ch] in $(srcdir), + put them into $(srcdir) when generated. Also add a dependency of + gtksignal.h on gtkmarshal.h for -j builds. + * gtk/gtk(dnd,style,gamma).c: Minor warning fixes. Wed Jul 28 09:29:19 1999 Owen Taylor diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index c2057099fa..cffc14d665 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,11 +1,17 @@ +1999-07-30 Raja R Harinath + + * gtk/Makefile.am (stamp-m): Don't `mv' from builddir to srcdir, + use `cp' followed by `rm' (the `rm' was already there). + July 30, 1999 Elliot Lee - . configure.in: Fix autoconf warnings about cross compilation by trying to - provide sane defaults for AC_TRY_RUN. - . docs/Makefile.am: Tell distcheck how to generate the .gif files. - . gtk/Makefile.am: If we refer to gtkmarshal.[ch] in $(srcdir), put them into - $(srcdir) when generated. Also add a dependency of gtksignal.h on gtkmarshal.h - for -j builds. - . gtk/gtk(dnd,style,gamma).c: Minor warning fixes. + + * configure.in: Fix autoconf warnings about cross compilation by + trying to provide sane defaults for AC_TRY_RUN. + * docs/Makefile.am: Tell distcheck how to generate the .gif files. + * gtk/Makefile.am: If we refer to gtkmarshal.[ch] in $(srcdir), + put them into $(srcdir) when generated. Also add a dependency of + gtksignal.h on gtkmarshal.h for -j builds. + * gtk/gtk(dnd,style,gamma).c: Minor warning fixes. Wed Jul 28 09:29:19 1999 Owen Taylor diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index c2057099fa..cffc14d665 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,11 +1,17 @@ +1999-07-30 Raja R Harinath + + * gtk/Makefile.am (stamp-m): Don't `mv' from builddir to srcdir, + use `cp' followed by `rm' (the `rm' was already there). + July 30, 1999 Elliot Lee - . configure.in: Fix autoconf warnings about cross compilation by trying to - provide sane defaults for AC_TRY_RUN. - . docs/Makefile.am: Tell distcheck how to generate the .gif files. - . gtk/Makefile.am: If we refer to gtkmarshal.[ch] in $(srcdir), put them into - $(srcdir) when generated. Also add a dependency of gtksignal.h on gtkmarshal.h - for -j builds. - . gtk/gtk(dnd,style,gamma).c: Minor warning fixes. + + * configure.in: Fix autoconf warnings about cross compilation by + trying to provide sane defaults for AC_TRY_RUN. + * docs/Makefile.am: Tell distcheck how to generate the .gif files. + * gtk/Makefile.am: If we refer to gtkmarshal.[ch] in $(srcdir), + put them into $(srcdir) when generated. Also add a dependency of + gtksignal.h on gtkmarshal.h for -j builds. + * gtk/gtk(dnd,style,gamma).c: Minor warning fixes. Wed Jul 28 09:29:19 1999 Owen Taylor diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index c2057099fa..cffc14d665 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,11 +1,17 @@ +1999-07-30 Raja R Harinath + + * gtk/Makefile.am (stamp-m): Don't `mv' from builddir to srcdir, + use `cp' followed by `rm' (the `rm' was already there). + July 30, 1999 Elliot Lee - . configure.in: Fix autoconf warnings about cross compilation by trying to - provide sane defaults for AC_TRY_RUN. - . docs/Makefile.am: Tell distcheck how to generate the .gif files. - . gtk/Makefile.am: If we refer to gtkmarshal.[ch] in $(srcdir), put them into - $(srcdir) when generated. Also add a dependency of gtksignal.h on gtkmarshal.h - for -j builds. - . gtk/gtk(dnd,style,gamma).c: Minor warning fixes. + + * configure.in: Fix autoconf warnings about cross compilation by + trying to provide sane defaults for AC_TRY_RUN. + * docs/Makefile.am: Tell distcheck how to generate the .gif files. + * gtk/Makefile.am: If we refer to gtkmarshal.[ch] in $(srcdir), + put them into $(srcdir) when generated. Also add a dependency of + gtksignal.h on gtkmarshal.h for -j builds. + * gtk/gtk(dnd,style,gamma).c: Minor warning fixes. Wed Jul 28 09:29:19 1999 Owen Taylor diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index c2057099fa..cffc14d665 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,11 +1,17 @@ +1999-07-30 Raja R Harinath + + * gtk/Makefile.am (stamp-m): Don't `mv' from builddir to srcdir, + use `cp' followed by `rm' (the `rm' was already there). + July 30, 1999 Elliot Lee - . configure.in: Fix autoconf warnings about cross compilation by trying to - provide sane defaults for AC_TRY_RUN. - . docs/Makefile.am: Tell distcheck how to generate the .gif files. - . gtk/Makefile.am: If we refer to gtkmarshal.[ch] in $(srcdir), put them into - $(srcdir) when generated. Also add a dependency of gtksignal.h on gtkmarshal.h - for -j builds. - . gtk/gtk(dnd,style,gamma).c: Minor warning fixes. + + * configure.in: Fix autoconf warnings about cross compilation by + trying to provide sane defaults for AC_TRY_RUN. + * docs/Makefile.am: Tell distcheck how to generate the .gif files. + * gtk/Makefile.am: If we refer to gtkmarshal.[ch] in $(srcdir), + put them into $(srcdir) when generated. Also add a dependency of + gtksignal.h on gtkmarshal.h for -j builds. + * gtk/gtk(dnd,style,gamma).c: Minor warning fixes. Wed Jul 28 09:29:19 1999 Owen Taylor diff --git a/gtk/Makefile.am b/gtk/Makefile.am index 00df38004e..4b3039d7e2 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -301,9 +301,9 @@ $(srcdir)/gtkmarshal.c $(srcdir)/gtkmarshal.h: @REBUILD@ stamp-m stamp-m: @REBUILD@ $(srcdir)/gtkmarshal.list $(srcdir)/genmarshal.pl (srcdir=$(srcdir) INDENT=$(INDENT) $(PERL) $(srcdir)/genmarshal.pl \ - && (cmp -s s-gmc $(srcdir)/gtkmarshal.c || mv s-gmc $(srcdir)/gtkmarshal.c) \ + && (cmp -s s-gmc $(srcdir)/gtkmarshal.c || cp s-gmc $(srcdir)/gtkmarshal.c) \ && rm -f s-gmc \ - && (cmp -s s-gmh $(srcdir)/gtkmarshal.h || mv s-gmh $(srcdir)/gtkmarshal.h) \ + && (cmp -s s-gmh $(srcdir)/gtkmarshal.h || cp s-gmh $(srcdir)/gtkmarshal.h) \ && rm -f s-gmh) \ && echo timestamp > stamp-m