Try to prevent endless regeneration of Makefile.in caused to RCS Id expansion.

40 files changed, 41 insertions, 41 deletions

diff --git a/lib/fontconfig/Makefile.am b/lib/fontconfig/Makefile.am
index 19cccb685..25c706ba3 100644
--- a/lib/fontconfig/Makefile.am
+++ b/lib/fontconfig/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 18:41:34 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:41:34 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard
 # 
diff --git a/lib/fontconfig/conf.d/Makefile.am b/lib/fontconfig/conf.d/Makefile.am
index 1d8cbc702..e8d90feff 100644
--- a/lib/fontconfig/conf.d/Makefile.am
+++ b/lib/fontconfig/conf.d/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 18:42:50 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:42:50 matthieu Exp $
 # 
 #  Copyright © 2005 Keith Packard
 # 
diff --git a/lib/fontconfig/doc/Makefile.am b/lib/fontconfig/doc/Makefile.am
index f2fb82e26..d1311af5f 100644
--- a/lib/fontconfig/doc/Makefile.am
+++ b/lib/fontconfig/doc/Makefile.am
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.am,v 1.1 2006/11/25 18:41:58 matthieu Exp $
+# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:41:58 matthieu Exp $
 #
 # Copyright © 2003 Keith Packard
 #
diff --git a/lib/fontconfig/fc-cache/Makefile.am b/lib/fontconfig/fc-cache/Makefile.am
index 8e42e4c1f..f9893c187 100644
--- a/lib/fontconfig/fc-cache/Makefile.am
+++ b/lib/fontconfig/fc-cache/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 18:42:47 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:42:47 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard
 # 
diff --git a/lib/fontconfig/fc-cat/Makefile.am b/lib/fontconfig/fc-cat/Makefile.am
index 98ad36ad8..761e04c4d 100644
--- a/lib/fontconfig/fc-cat/Makefile.am
+++ b/lib/fontconfig/fc-cat/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 18:42:48 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:42:48 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard
 # 
diff --git a/lib/fontconfig/fc-list/Makefile.am b/lib/fontconfig/fc-list/Makefile.am
index 87684afc8..3a00d3058 100644
--- a/lib/fontconfig/fc-list/Makefile.am
+++ b/lib/fontconfig/fc-list/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 18:42:49 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:42:49 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard
 # 
diff --git a/lib/fontconfig/fc-match/Makefile.am b/lib/fontconfig/fc-match/Makefile.am
index 38ee743c9..5f06f7d43 100644
--- a/lib/fontconfig/fc-match/Makefile.am
+++ b/lib/fontconfig/fc-match/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 18:42:50 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:42:50 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard
 # 
diff --git a/lib/fontconfig/src/Makefile.am b/lib/fontconfig/src/Makefile.am
index 3e0dcfe2d..f18192293 100644
--- a/lib/fontconfig/src/Makefile.am
+++ b/lib/fontconfig/src/Makefile.am
@@ -1,5 +1,5 @@
 #
-# $Id: Makefile.am,v 1.1 2006/11/25 18:42:23 matthieu Exp $
+# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:42:23 matthieu Exp $
 #
 # Copyright © 2003 Keith Packard
 #
diff --git a/lib/libFS/Makefile.am b/lib/libFS/Makefile.am
index f052d0296..5256b14d9 100644
--- a/lib/libFS/Makefile.am
+++ b/lib/libFS/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 16:34:55 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 16:34:55 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard, Noah Levitt
 # 
diff --git a/lib/libXRes/Makefile.am b/lib/libXRes/Makefile.am
index 29aee905c..9e5326258 100644
--- a/lib/libXRes/Makefile.am
+++ b/lib/libXRes/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 16:50:23 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 16:50:23 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard, Noah Levitt
 # 
diff --git a/lib/libXRes/man/Makefile.am b/lib/libXRes/man/Makefile.am
index f5fac3fd7..cefba7db2 100644
--- a/lib/libXRes/man/Makefile.am
+++ b/lib/libXRes/man/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2006/11/25 16:50:26 matthieu Exp $
+# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 16:50:26 matthieu Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
diff --git a/lib/libXScrnSaver/man/Makefile.am b/lib/libXScrnSaver/man/Makefile.am
index 5f78857df..65726cb9c 100644
--- a/lib/libXScrnSaver/man/Makefile.am
+++ b/lib/libXScrnSaver/man/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2006/11/25 16:53:06 matthieu Exp $
+# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 16:53:06 matthieu Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
diff --git a/lib/libXTrap/Makefile.am b/lib/libXTrap/Makefile.am
index 8458a882f..acaebd982 100644
--- a/lib/libXTrap/Makefile.am
+++ b/lib/libXTrap/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 16:53:50 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 16:53:50 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard, Noah Levitt
 # 
diff --git a/lib/libXaw/man/Makefile.am b/lib/libXaw/man/Makefile.am
index 5811dfb15..3d9dd0e59 100644
--- a/lib/libXaw/man/Makefile.am
+++ b/lib/libXaw/man/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2006/11/25 16:56:16 matthieu Exp $
+# $Xorg: Makefile.am,v 1.5 2005/11/28 22:03:05 alanc Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
diff --git a/lib/libXcomposite/Makefile.am b/lib/libXcomposite/Makefile.am
index b82a638d0..f1919b63b 100644
--- a/lib/libXcomposite/Makefile.am
+++ b/lib/libXcomposite/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 16:58:21 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 16:58:21 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard, Noah Levitt
 # 
diff --git a/lib/libXcomposite/src/Makefile.am b/lib/libXcomposite/src/Makefile.am
index c76e2ebdd..b58f934db 100644
--- a/lib/libXcomposite/src/Makefile.am
+++ b/lib/libXcomposite/src/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 16:58:22 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 16:58:22 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard, Noah Levitt
 # 
diff --git a/lib/libXcursor/Makefile.am b/lib/libXcursor/Makefile.am
index b5dbcff38..fdfd8aeb3 100644
--- a/lib/libXcursor/Makefile.am
+++ b/lib/libXcursor/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 17:00:27 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:00:27 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard, Noah Levitt
 # 
diff --git a/lib/libXdamage/Makefile.am b/lib/libXdamage/Makefile.am
index a6c5bc221..5f22c68f9 100644
--- a/lib/libXdamage/Makefile.am
+++ b/lib/libXdamage/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 17:01:22 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:01:22 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard, Noah Levitt
 # 
diff --git a/lib/libXevie/Makefile.am b/lib/libXevie/Makefile.am
index b3869b302..a5f606901 100644
--- a/lib/libXevie/Makefile.am
+++ b/lib/libXevie/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2006/11/25 17:04:50 matthieu Exp $
+# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:04:50 matthieu Exp $
 
 AM_CFLAGS = $(XEVIE_CFLAGS) $(X_CFLAGS)
 
diff --git a/lib/libXevie/man/Makefile.am b/lib/libXevie/man/Makefile.am
index 7f8bc92aa..c7f0c7c5b 100644
--- a/lib/libXevie/man/Makefile.am
+++ b/lib/libXevie/man/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2006/11/25 17:04:52 matthieu Exp $
+# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:04:52 matthieu Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
diff --git a/lib/libXfixes/Makefile.am b/lib/libXfixes/Makefile.am
index 68465c0b2..a34f617e1 100644
--- a/lib/libXfixes/Makefile.am
+++ b/lib/libXfixes/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 17:10:50 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:10:50 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard, Noah Levitt
 # 
diff --git a/lib/libXfixes/man/Makefile.am b/lib/libXfixes/man/Makefile.am
index e3bcc6c76..270a9b213 100644
--- a/lib/libXfixes/man/Makefile.am
+++ b/lib/libXfixes/man/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2006/11/25 17:11:05 matthieu Exp $
+# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:11:05 matthieu Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
diff --git a/lib/libXfont/Makefile.am b/lib/libXfont/Makefile.am
index 960f704e9..9bf76660b 100644
--- a/lib/libXfont/Makefile.am
+++ b/lib/libXfont/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 17:14:30 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:14:30 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard, Noah Levitt
 # 
diff --git a/lib/libXfont/src/Makefile.am b/lib/libXfont/src/Makefile.am
index e1b015665..2cf97fa43 100644
--- a/lib/libXfont/src/Makefile.am
+++ b/lib/libXfont/src/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 17:14:31 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:14:31 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard, Noah Levitt
 # 
diff --git a/lib/libXfontcache/man/Makefile.am b/lib/libXfontcache/man/Makefile.am
index fce2ae7a4..4fa33808c 100644
--- a/lib/libXfontcache/man/Makefile.am
+++ b/lib/libXfontcache/man/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2006/11/25 17:19:14 matthieu Exp $
+# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:19:14 matthieu Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
diff --git a/lib/libXft/Makefile.am b/lib/libXft/Makefile.am
index c70718b84..8c278f325 100644
--- a/lib/libXft/Makefile.am
+++ b/lib/libXft/Makefile.am
@@ -1,5 +1,5 @@
 #
-#  $Id: Makefile.am,v 1.1 2006/11/25 17:21:35 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:21:35 matthieu Exp $
 #
 #  Copyright © 2003 Keith Packard, Noah Levitt
 #
diff --git a/lib/libXi/man/Makefile.am b/lib/libXi/man/Makefile.am
index 30bf93093..51f1e3045 100644
--- a/lib/libXi/man/Makefile.am
+++ b/lib/libXi/man/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2006/11/25 17:23:03 matthieu Exp $
+# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:23:03 matthieu Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
diff --git a/lib/libXmu/Makefile.am b/lib/libXmu/Makefile.am
index 857040597..bf630766b 100644
--- a/lib/libXmu/Makefile.am
+++ b/lib/libXmu/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2006/11/25 17:27:50 matthieu Exp $
+# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:27:50 matthieu Exp $
 
 SUBDIRS = include src
 
diff --git a/lib/libXp/Makefile.am b/lib/libXp/Makefile.am
index ddb584fe3..034b04f93 100644
--- a/lib/libXp/Makefile.am
+++ b/lib/libXp/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 17:28:52 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:28:52 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard, Noah Levitt
 # 
diff --git a/lib/libXp/man/Makefile.am b/lib/libXp/man/Makefile.am
index 985e2ec91..97d521cc8 100644
--- a/lib/libXp/man/Makefile.am
+++ b/lib/libXp/man/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2006/11/25 17:29:08 matthieu Exp $
+# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:29:08 matthieu Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
diff --git a/lib/libXrandr/Makefile.am b/lib/libXrandr/Makefile.am
index d7a094b89..2c14e2bf7 100644
--- a/lib/libXrandr/Makefile.am
+++ b/lib/libXrandr/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 17:37:51 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:37:51 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard, Noah Levitt
 # 
diff --git a/lib/libXrandr/man/Makefile.am b/lib/libXrandr/man/Makefile.am
index 2e2150c40..e20b7adff 100644
--- a/lib/libXrandr/man/Makefile.am
+++ b/lib/libXrandr/man/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2006/11/25 17:37:52 matthieu Exp $
+# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:37:52 matthieu Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
diff --git a/lib/libXrender/Makefile.am b/lib/libXrender/Makefile.am
index 98c44f642..21f8d119d 100644
--- a/lib/libXrender/Makefile.am
+++ b/lib/libXrender/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 17:55:16 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 17:55:16 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard, Noah Levitt
 # 
diff --git a/lib/libXt/Makefile.am b/lib/libXt/Makefile.am
index bff30662a..cbf225327 100644
--- a/lib/libXt/Makefile.am
+++ b/lib/libXt/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 18:01:50 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:01:50 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard, Noah Levitt
 # 
diff --git a/lib/libXt/Makefile.bsd-wrapper b/lib/libXt/Makefile.bsd-wrapper
index 8c572b977..1b8fc5190 100644
--- a/lib/libXt/Makefile.bsd-wrapper
+++ b/lib/libXt/Makefile.bsd-wrapper
@@ -1,7 +1,7 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:16:59 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2006/11/28 11:48:11 matthieu Exp $
 
 SHARED_LIBS=	Xt 9.0
 
-CONFIGURE_ARGS= --with-appdefaultdir=$(LIBDIR)/X11/app-defaults
+CONFIGURE_ARGS= --with-appdefaultdir=/etc/X11/app-defaults
 
 .include <bsd.xorg.mk>
diff --git a/lib/libXv/man/Makefile.am b/lib/libXv/man/Makefile.am
index 1d9ac52e5..25408b7f0 100644
--- a/lib/libXv/man/Makefile.am
+++ b/lib/libXv/man/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2006/11/25 18:04:55 matthieu Exp $
+# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:04:55 matthieu Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
diff --git a/lib/libXxf86dga/man/Makefile.am b/lib/libXxf86dga/man/Makefile.am
index 1da0432fd..3d83b7179 100644
--- a/lib/libXxf86dga/man/Makefile.am
+++ b/lib/libXxf86dga/man/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2006/11/25 18:07:00 matthieu Exp $
+# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:07:00 matthieu Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
diff --git a/lib/libXxf86misc/man/Makefile.am b/lib/libXxf86misc/man/Makefile.am
index c0aa9eef6..1188ec008 100644
--- a/lib/libXxf86misc/man/Makefile.am
+++ b/lib/libXxf86misc/man/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2006/11/25 18:08:12 matthieu Exp $
+# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:08:12 matthieu Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
diff --git a/lib/libXxf86vm/man/Makefile.am b/lib/libXxf86vm/man/Makefile.am
index 4a14bcc29..9287e84fe 100644
--- a/lib/libXxf86vm/man/Makefile.am
+++ b/lib/libXxf86vm/man/Makefile.am
@@ -1,4 +1,4 @@
-# $Id: Makefile.am,v 1.1 2006/11/25 18:10:09 matthieu Exp $
+# $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:10:09 matthieu Exp $
 #
 # Copyright 2005 Sun Microsystems, Inc.  All rights reserved.
 # 
diff --git a/lib/liblbxutil/Makefile.am b/lib/liblbxutil/Makefile.am
index 52f281566..6f8afd585 100644
--- a/lib/liblbxutil/Makefile.am
+++ b/lib/liblbxutil/Makefile.am
@@ -1,5 +1,5 @@
 # 
-#  $Id: Makefile.am,v 1.1 2006/11/25 18:20:30 matthieu Exp $
+#  $Xorg: Makefile.am,v 1.1.1.1 2006/11/25 18:20:30 matthieu Exp $
 # 
 #  Copyright © 2003 Keith Packard, Noah Levitt
 #