From af2d862517883b06ddf88d00d5cc7ab3630954c7 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Thu, 14 Nov 2002 06:07:46 +0000 Subject: [PATCH] Try a different hack to force gdkenumtypes.h to be updated before building Fri Nov 8 18:04:16 2002 Owen Taylor * gdk/{linux-fb,win32,11}/Makefile.am: Try a different hack to force gdkenumtypes.h to be updated before building the subdir, last hack caused contents to be rebuilt on every make. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ gdk/linux-fb/Makefile.am | 6 ++---- gdk/win32/Makefile.am | 6 ++---- gdk/x11/Makefile.am | 6 ++---- 9 files changed, 48 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 98a2542d8a..7e308e0a50 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Fri Nov 8 18:04:16 2002 Owen Taylor + + * gdk/{linux-fb,win32,11}/Makefile.am: Try a different + hack to force gdkenumtypes.h to be updated before + building the subdir, last hack caused contents + to be rebuilt on every make. + Wed Nov 13 21:45:36 2002 Manish Singh * gtk/gtkhsv.c: get rid of deprecated gdk_rgb_gc_set_foreground diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 98a2542d8a..7e308e0a50 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +Fri Nov 8 18:04:16 2002 Owen Taylor + + * gdk/{linux-fb,win32,11}/Makefile.am: Try a different + hack to force gdkenumtypes.h to be updated before + building the subdir, last hack caused contents + to be rebuilt on every make. + Wed Nov 13 21:45:36 2002 Manish Singh * gtk/gtkhsv.c: get rid of deprecated gdk_rgb_gc_set_foreground diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 98a2542d8a..7e308e0a50 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,10 @@ +Fri Nov 8 18:04:16 2002 Owen Taylor + + * gdk/{linux-fb,win32,11}/Makefile.am: Try a different + hack to force gdkenumtypes.h to be updated before + building the subdir, last hack caused contents + to be rebuilt on every make. + Wed Nov 13 21:45:36 2002 Manish Singh * gtk/gtkhsv.c: get rid of deprecated gdk_rgb_gc_set_foreground diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 98a2542d8a..7e308e0a50 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,10 @@ +Fri Nov 8 18:04:16 2002 Owen Taylor + + * gdk/{linux-fb,win32,11}/Makefile.am: Try a different + hack to force gdkenumtypes.h to be updated before + building the subdir, last hack caused contents + to be rebuilt on every make. + Wed Nov 13 21:45:36 2002 Manish Singh * gtk/gtkhsv.c: get rid of deprecated gdk_rgb_gc_set_foreground diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 98a2542d8a..7e308e0a50 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,10 @@ +Fri Nov 8 18:04:16 2002 Owen Taylor + + * gdk/{linux-fb,win32,11}/Makefile.am: Try a different + hack to force gdkenumtypes.h to be updated before + building the subdir, last hack caused contents + to be rebuilt on every make. + Wed Nov 13 21:45:36 2002 Manish Singh * gtk/gtkhsv.c: get rid of deprecated gdk_rgb_gc_set_foreground diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 98a2542d8a..7e308e0a50 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +Fri Nov 8 18:04:16 2002 Owen Taylor + + * gdk/{linux-fb,win32,11}/Makefile.am: Try a different + hack to force gdkenumtypes.h to be updated before + building the subdir, last hack caused contents + to be rebuilt on every make. + Wed Nov 13 21:45:36 2002 Manish Singh * gtk/gtkhsv.c: get rid of deprecated gdk_rgb_gc_set_foreground diff --git a/gdk/linux-fb/Makefile.am b/gdk/linux-fb/Makefile.am index d50b0c6051..39f53ce9dc 100644 --- a/gdk/linux-fb/Makefile.am +++ b/gdk/linux-fb/Makefile.am @@ -87,9 +87,7 @@ EXTRA_DIST=x-cursors.xbm # Hack to get gdkenumtypes.h built first ########################################### -$(libgdk_linux_fb_la_OBJECTS): update-enum-types +$(libgdk_x11_la_OBJECTS): $(top_srcdir)/gdk/gdkenumtypes.h -update-enum-types: +$(top_srcdir)/gdk/gdkenumtypes.h: @cd $(top_builddir)/gdk && make $(AM_MAKEFLAGS) gdkenumtypes.h - -.PHONY: update-enum-types diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am index 07a090a441..698aa9b4c2 100644 --- a/gdk/win32/Makefile.am +++ b/gdk/win32/Makefile.am @@ -87,9 +87,7 @@ libgdk_win32_la_LIBADD = rc/gdk-win32res.lo # Hack to get gdkenumtypes.h built first ########################################### -$(libgdk_win32_la_OBJECTS): update-enum-types +$(libgdk_x11_la_OBJECTS): $(top_srcdir)/gdk/gdkenumtypes.h -update-enum-types: +$(top_srcdir)/gdk/gdkenumtypes.h: @cd $(top_builddir)/gdk && make $(AM_MAKEFLAGS) gdkenumtypes.h - -.PHONY: update-enum-types diff --git a/gdk/x11/Makefile.am b/gdk/x11/Makefile.am index e122d16e39..3beac84346 100644 --- a/gdk/x11/Makefile.am +++ b/gdk/x11/Makefile.am @@ -82,9 +82,7 @@ EXTRA_DIST = \ # Hack to get gdkenumtypes.h built first ########################################### -$(libgdk_x11_la_OBJECTS): update-enum-types +$(libgdk_x11_la_OBJECTS): $(top_srcdir)/gdk/gdkenumtypes.h -update-enum-types: +$(top_srcdir)/gdk/gdkenumtypes.h: @cd $(top_builddir)/gdk && make $(AM_MAKEFLAGS) gdkenumtypes.h - -.PHONY: update-enum-types