From 822fab280f637ee25e5ca049778d30387c30fd4b Mon Sep 17 00:00:00 2001 From: Elliot Lee Date: Tue, 21 Dec 1999 23:36:07 +0000 Subject: [PATCH] Fix builddir != srcdir for generation of gtktypebuiltins*.[ch] * gtk/Makefile.am: Fix builddir != srcdir for generation of gtktypebuiltins*.[ch] --- ChangeLog | 4 ++++ ChangeLog.pre-2-0 | 4 ++++ ChangeLog.pre-2-10 | 4 ++++ ChangeLog.pre-2-2 | 4 ++++ ChangeLog.pre-2-4 | 4 ++++ ChangeLog.pre-2-6 | 4 ++++ ChangeLog.pre-2-8 | 4 ++++ gtk/Makefile.am | 12 ++++++------ 8 files changed, 34 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f2e6c1ce12..35ba20b095 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +December 20, 1999 Elliot Lee + * gtk/Makefile.am: Fix builddir != srcdir for + generation of gtktypebuiltins*.[ch] + Thu Dec 2 10:59:14 1999 Owen Taylor * gdk/gdkdnd.c (xdnd_check_dest): Allow version >= 3, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index f2e6c1ce12..35ba20b095 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,7 @@ +December 20, 1999 Elliot Lee + * gtk/Makefile.am: Fix builddir != srcdir for + generation of gtktypebuiltins*.[ch] + Thu Dec 2 10:59:14 1999 Owen Taylor * gdk/gdkdnd.c (xdnd_check_dest): Allow version >= 3, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f2e6c1ce12..35ba20b095 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +December 20, 1999 Elliot Lee + * gtk/Makefile.am: Fix builddir != srcdir for + generation of gtktypebuiltins*.[ch] + Thu Dec 2 10:59:14 1999 Owen Taylor * gdk/gdkdnd.c (xdnd_check_dest): Allow version >= 3, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index f2e6c1ce12..35ba20b095 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +December 20, 1999 Elliot Lee + * gtk/Makefile.am: Fix builddir != srcdir for + generation of gtktypebuiltins*.[ch] + Thu Dec 2 10:59:14 1999 Owen Taylor * gdk/gdkdnd.c (xdnd_check_dest): Allow version >= 3, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index f2e6c1ce12..35ba20b095 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +December 20, 1999 Elliot Lee + * gtk/Makefile.am: Fix builddir != srcdir for + generation of gtktypebuiltins*.[ch] + Thu Dec 2 10:59:14 1999 Owen Taylor * gdk/gdkdnd.c (xdnd_check_dest): Allow version >= 3, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f2e6c1ce12..35ba20b095 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +December 20, 1999 Elliot Lee + * gtk/Makefile.am: Fix builddir != srcdir for + generation of gtktypebuiltins*.[ch] + Thu Dec 2 10:59:14 1999 Owen Taylor * gdk/gdkdnd.c (xdnd_check_dest): Allow version >= 3, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f2e6c1ce12..35ba20b095 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +December 20, 1999 Elliot Lee + * gtk/Makefile.am: Fix builddir != srcdir for + generation of gtktypebuiltins*.[ch] + Thu Dec 2 10:59:14 1999 Owen Taylor * gdk/gdkdnd.c (xdnd_check_dest): Allow version >= 3, diff --git a/gtk/Makefile.am b/gtk/Makefile.am index b095b87be8..a4ade14a7e 100644 --- a/gtk/Makefile.am +++ b/gtk/Makefile.am @@ -355,18 +355,18 @@ stamp-gtktypebuiltins.h: @REBUILD@ maketypes.awk stamp-gtk.defs gtktypebuiltins. gtktypebuiltins_vars.c: @REBUILD@ maketypes.awk stamp-gtk.defs cd $(srcdir) \ && $(AWK) -f maketypes.awk gtk.defs variables > xgen-gtbvc \ - && cp xgen-gtbvc $@ \ - && rm -f xgen-gtbvc + cp $(srcdir)/xgen-gtbvc gtktypebuiltins_vars.c \ + && rm -f $(srcdir)/xgen-gtbvc gtktypebuiltins_ids.c: @REBUILD@ maketypes.awk stamp-gtk.defs cd $(srcdir) \ && $(AWK) -f maketypes.awk gtk.defs entries > xgen-gtbic \ - && cp xgen-gtbic $@ \ - && rm -f xgen-gtbic + cp $(srcdir)/xgen-gtbic gtktypebuiltins_ids.c \ + && rm -f $(srcdir)/xgen-gtbic gtktypebuiltins_evals.c: @REBUILD@ makeenums.pl $(gtk_public_h_sources) $(gdk_headers) cd $(srcdir) \ && $(PERL) makeenums.pl arrays $(gtk_public_h_sources) $(gdk_headers) > xgen-gtbec \ - && cp xgen-gtbec $@ \ - && rm -f xgen-gtbec + cp $(srcdir)/xgen-gtbec gtktypebuiltins_evals \ + && rm -f $(srcdir)/xgen-gtbec gtkconfdir = $(sysconfdir)/gtk