WWW symlink auf XCompose ergänzt.

XCompose in globalem Makefile eingetragen.
www/Compose.neo bleibt für Rückwärtskompatibilität, kann langfristig entfallen.


git-svn-id: https://svn.neo-layout.org@1934 b9310e46-f624-0410-8ea1-cfbb3a30dc96

3 files changed, 20 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index f25d761..fa60ff0 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 62945b5..f7fc501 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 0000000..f6a362f
--- /dev/null
+++ b/www/XCompose
@@ -0,0 +1 @@
+../Compose/XCompose
\ No newline at end of file