From a0c6582f703d732b5796b0aa7b8968439c512c0c Mon Sep 17 00:00:00 2001
From: hans-christoph <hans-christoph>
Date: Wed, 15 Jul 2009 14:25:12 +0000
Subject: [PATCH] =?UTF-8?q?WWW=20symlink=20auf=20XCompose=20erg=C3=A4nzt.?=
 =?UTF-8?q?=20XCompose=20in=20globalem=20Makefile=20eingetragen.=20www/Com?=
 =?UTF-8?q?pose.neo=20bleibt=20f=C3=BCr=20R=C3=BCckw=C3=A4rtskompatibilit?=
 =?UTF-8?q?=C3=A4t,=20kann=20langfristig=20entfallen.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile        | 29 ++++++++++++++++++-----------
 www/Compose.neo |  2 +-
 www/XCompose    |  1 +
 3 files changed, 20 insertions(+), 12 deletions(-)
 create mode 120000 www/XCompose

diff --git a/Makefile b/Makefile
index f25d761d..fa60ff06 100644
--- a/Makefile
+++ b/Makefile
@@ -1,31 +1,38 @@
-all: portable grafik linux/bin/installiere_neo windows/kbdneo2/Treiber
+all: 	portable \
+	grafik \
+	linux/bin/installiere_neo \
+	windows/kbdneo2/Treiber \
+	Compose
 
 # wo befinden sich die zu bearbeitenden Dateien (bzw. eigentlich nur Name
 # des Parameters)
 windows/kbdneo2/Treiber:
-	# wo befindet sich das Makefile
-	make -kC windows/kbdneo2/Treiber 
+	-make -kC windows/kbdneo2/Treiber 
 
 portable:
-	make -kC portable deploy
+	-make -kC portable deploy
 
 grafik:
-	make -kC grafik 
+	-make -kC grafik 
 
 linux/bin/installiere_neo:
-	make -kC linux
+	-make -kC linux
+
+Compose:
+	-make -C Compose XCompose
 
 svnclean:
-	make -C portable clean
-	make -C linux clean
-	make -C windows/kbdneo2/Treiber clean
+	-make -C portable clean
+	-make -C linux clean
+	-make -C windows/kbdneo2/Treiber clean
+	-make -C Compose clean
 
 clean: svnclean 
-	make -kC grafik clean
+	-make -kC grafik clean
 
 svnupdate: 
 	make svnclean
 	svn up
 	make -k
 
-.PHONY: all clean svnupdate svnclean portable grafik linux/bin/installiere_neo windows/kbdneo2/Treiber
+.PHONY: all clean svnupdate svnclean portable grafik linux/bin/installiere_neo windows/kbdneo2/Treiber Compose
diff --git a/www/Compose.neo b/www/Compose.neo
index 62945b58..f7fc5018 120000
--- a/www/Compose.neo
+++ b/www/Compose.neo
@@ -1 +1 @@
-../Compose/Compose.neo
\ No newline at end of file
+./XCompose
\ No newline at end of file
diff --git a/www/XCompose b/www/XCompose
new file mode 120000
index 00000000..f6a362f8
--- /dev/null
+++ b/www/XCompose
@@ -0,0 +1 @@
+../Compose/XCompose
\ No newline at end of file