From 151ba8b67fd88a721f9f72d3019212b22f5cd3e2 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 17 Oct 2005 22:25:58 +0000 Subject: [PATCH] Work around automake-1.7 braindamage by providing an explicit rule for XOrgCfg. --- ChangeLog | 6 ++++++ hw/xfree86/utils/xorgcfg/Makefile.am | 5 +++++ 2 files changed, 11 insertions(+) diff --git a/ChangeLog b/ChangeLog index 25a712474..f6ca9728f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2005-10-17 Adam Jackson + + * hw/xfree86/utils/xorgcfg/Makefile.am: + Work around automake-1.7 braindamage by providing an explicit rule + for XOrgCfg. + 2005-10-17 Kristian Høgsberg * configure.ac: Fix whitespace in AS_HELP_STRING uses, convert diff --git a/hw/xfree86/utils/xorgcfg/Makefile.am b/hw/xfree86/utils/xorgcfg/Makefile.am index 98195d083..46c316a8d 100644 --- a/hw/xfree86/utils/xorgcfg/Makefile.am +++ b/hw/xfree86/utils/xorgcfg/Makefile.am @@ -123,6 +123,11 @@ appdefault_DATA = $(APPDEFAULTFILES) CPP_FILES_FLAGS = -D__VENDORNAME__="@VENDOR_STRING@" \ -D__VENDORVERS__="@VENDOR_RELEASE@" +# dear automake: it would be really nice if you would actually put things into +# .SUFFIXES so i wouldnt' have to do this. +XOrgCfg: XOrgCfg.pre + $(RAWCPP) $(RAWCPPFLAGS) $(CPP_FILES_FLAGS) < $< | $(CPP_SED_MAGIC) > $@ + # Man page man1_MANS = xorgcfg.man