From acabff8da807488be441ac496d6cfc0e4e22be47 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Fri, 18 Sep 2009 12:54:11 +0000
Subject: Solved circular dependency.

---
 xorg-server/xkbdata.src/compat/default       | 13 -------------
 xorg-server/xkbdata.src/compat/default.in    | 13 +++++++++++++
 xorg-server/xkbdata.src/semantics/default    |  7 -------
 xorg-server/xkbdata.src/semantics/default.in |  7 +++++++
 xorg-server/xkbdata.src/types/default        | 12 ------------
 xorg-server/xkbdata.src/types/default.in     | 12 ++++++++++++
 xorg-server/xkbdata.src/xkbrules.mak         |  2 +-
 7 files changed, 33 insertions(+), 33 deletions(-)
 delete mode 100644 xorg-server/xkbdata.src/compat/default
 create mode 100644 xorg-server/xkbdata.src/compat/default.in
 delete mode 100644 xorg-server/xkbdata.src/semantics/default
 create mode 100644 xorg-server/xkbdata.src/semantics/default.in
 delete mode 100644 xorg-server/xkbdata.src/types/default
 create mode 100644 xorg-server/xkbdata.src/types/default.in

diff --git a/xorg-server/xkbdata.src/compat/default b/xorg-server/xkbdata.src/compat/default
deleted file mode 100644
index 5355e1318..000000000
--- a/xorg-server/xkbdata.src/compat/default
+++ /dev/null
@@ -1,13 +0,0 @@
-// $XKeyboardConfig$
-// $Xorg: default,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
-default xkb_compatibility "default"  {
-    include "basic"
-    augment "mousekeys"
-    augment "accessx(basic)"
-    augment "misc"
-    augment "iso9995"
-    augment "level5"
-// ??should be changed/renamed/removed
-//    augment "xfree86"
-    augment "japan"
-};
diff --git a/xorg-server/xkbdata.src/compat/default.in b/xorg-server/xkbdata.src/compat/default.in
new file mode 100644
index 000000000..5355e1318
--- /dev/null
+++ b/xorg-server/xkbdata.src/compat/default.in
@@ -0,0 +1,13 @@
+// $XKeyboardConfig$
+// $Xorg: default,v 1.3 2000/08/17 19:54:34 cpqbld Exp $
+default xkb_compatibility "default"  {
+    include "basic"
+    augment "mousekeys"
+    augment "accessx(basic)"
+    augment "misc"
+    augment "iso9995"
+    augment "level5"
+// ??should be changed/renamed/removed
+//    augment "xfree86"
+    augment "japan"
+};
diff --git a/xorg-server/xkbdata.src/semantics/default b/xorg-server/xkbdata.src/semantics/default
deleted file mode 100644
index 42e755e3c..000000000
--- a/xorg-server/xkbdata.src/semantics/default
+++ /dev/null
@@ -1,7 +0,0 @@
-// $Xorg: default,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
-default xkb_semantics "default" {
-
-xkb_types		{ include "default" 	};
-xkb_compatibility	{ include "default"	};
-
-};
diff --git a/xorg-server/xkbdata.src/semantics/default.in b/xorg-server/xkbdata.src/semantics/default.in
new file mode 100644
index 000000000..42e755e3c
--- /dev/null
+++ b/xorg-server/xkbdata.src/semantics/default.in
@@ -0,0 +1,7 @@
+// $Xorg: default,v 1.3 2000/08/17 19:54:42 cpqbld Exp $
+default xkb_semantics "default" {
+
+xkb_types		{ include "default" 	};
+xkb_compatibility	{ include "default"	};
+
+};
diff --git a/xorg-server/xkbdata.src/types/default b/xorg-server/xkbdata.src/types/default
deleted file mode 100644
index 18859b742..000000000
--- a/xorg-server/xkbdata.src/types/default
+++ /dev/null
@@ -1,12 +0,0 @@
-// $XKeyboardConfig$
-// $Xorg: default,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
-
-default xkb_types "default" {
-    include "basic"
-    include "pc"
-    include "iso9995"
-    include "extra"
-    include "numpad"
-    include "level5"
-    include "mousekeys"
-};
diff --git a/xorg-server/xkbdata.src/types/default.in b/xorg-server/xkbdata.src/types/default.in
new file mode 100644
index 000000000..18859b742
--- /dev/null
+++ b/xorg-server/xkbdata.src/types/default.in
@@ -0,0 +1,12 @@
+// $XKeyboardConfig$
+// $Xorg: default,v 1.3 2000/08/17 19:54:48 cpqbld Exp $
+
+default xkb_types "default" {
+    include "basic"
+    include "pc"
+    include "iso9995"
+    include "extra"
+    include "numpad"
+    include "level5"
+    include "mousekeys"
+};
diff --git a/xorg-server/xkbdata.src/xkbrules.mak b/xorg-server/xkbdata.src/xkbrules.mak
index 67a0e55e7..3b5480e46 100644
--- a/xorg-server/xkbdata.src/xkbrules.mak
+++ b/xorg-server/xkbdata.src/xkbrules.mak
@@ -1,7 +1,7 @@
 DIRFILE=$(THISDIR:%=$(DESTDIR)\..\%.dir)
 all: $(DESTDIR) $(DATA_FILES) $(DIRFILE)
 
-$(DESTDIR)\default: default
+$(DESTDIR)\default: default.in
 	copy $< $@
 
 $(DESTDIR)\%: %
-- 
cgit v1.2.3