From 9310fe538f4da7453ae1547293795385003ec8c6 Mon Sep 17 00:00:00 2001 From: Eric Warmenhoven Date: Fri, 6 Dec 2002 00:12:53 +0000 Subject: [PATCH] Fix gdkenumtypes.h hack Thu Dec 5 16:01:14 2002 Eric Warmenhoven * gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack --- ChangeLog | 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 ++++ gdk/linux-fb/Makefile.am | 2 +- gdk/win32/Makefile.am | 2 +- 8 files changed, 26 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8c9968d8d5..9bd6cef549 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Dec 5 16:01:14 2002 Eric Warmenhoven + + * gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack + 2002-12-06 Matthias Clasen * gdk/gdkcolor.c: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 8c9968d8d5..9bd6cef549 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,7 @@ +Thu Dec 5 16:01:14 2002 Eric Warmenhoven + + * gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack + 2002-12-06 Matthias Clasen * gdk/gdkcolor.c: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 8c9968d8d5..9bd6cef549 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,7 @@ +Thu Dec 5 16:01:14 2002 Eric Warmenhoven + + * gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack + 2002-12-06 Matthias Clasen * gdk/gdkcolor.c: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 8c9968d8d5..9bd6cef549 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,7 @@ +Thu Dec 5 16:01:14 2002 Eric Warmenhoven + + * gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack + 2002-12-06 Matthias Clasen * gdk/gdkcolor.c: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 8c9968d8d5..9bd6cef549 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,7 @@ +Thu Dec 5 16:01:14 2002 Eric Warmenhoven + + * gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack + 2002-12-06 Matthias Clasen * gdk/gdkcolor.c: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 8c9968d8d5..9bd6cef549 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,7 @@ +Thu Dec 5 16:01:14 2002 Eric Warmenhoven + + * gdk/{linux-fb,win32}/Makefile.am: Fix gdkenumtypes.h hack + 2002-12-06 Matthias Clasen * gdk/gdkcolor.c: diff --git a/gdk/linux-fb/Makefile.am b/gdk/linux-fb/Makefile.am index 39f53ce9dc..25b4b984df 100644 --- a/gdk/linux-fb/Makefile.am +++ b/gdk/linux-fb/Makefile.am @@ -87,7 +87,7 @@ EXTRA_DIST=x-cursors.xbm # Hack to get gdkenumtypes.h built first ########################################### -$(libgdk_x11_la_OBJECTS): $(top_srcdir)/gdk/gdkenumtypes.h +$(libgdk_linux_fb_la_OBJECTS): $(top_srcdir)/gdk/gdkenumtypes.h $(top_srcdir)/gdk/gdkenumtypes.h: @cd $(top_builddir)/gdk && make $(AM_MAKEFLAGS) gdkenumtypes.h diff --git a/gdk/win32/Makefile.am b/gdk/win32/Makefile.am index 698aa9b4c2..d402aebb73 100644 --- a/gdk/win32/Makefile.am +++ b/gdk/win32/Makefile.am @@ -87,7 +87,7 @@ libgdk_win32_la_LIBADD = rc/gdk-win32res.lo # Hack to get gdkenumtypes.h built first ########################################### -$(libgdk_x11_la_OBJECTS): $(top_srcdir)/gdk/gdkenumtypes.h +$(libgdk_win32_la_OBJECTS): $(top_srcdir)/gdk/gdkenumtypes.h $(top_srcdir)/gdk/gdkenumtypes.h: @cd $(top_builddir)/gdk && make $(AM_MAKEFLAGS) gdkenumtypes.h