Aufräumen in Compose und Unterverzeichnissen.

- Directory src erzeugt, welches alle Modul-Quelldateien aufnimmt

- Umbenennen der Modul-Quelldateien:

  Compose.neo                         src/base.module
  Compose_greek.neo                   src/greek.module
  Compose_many_klingon_numericals.neo src/klingon.module
  Compose_many_roman_numericals.neo   src/roman.module
  Compose_math_and_physics.neo        src/math.module
  Compose_sprachen.neo                src/lang.module

- Löschen der zusammengesetzten generierbaren Dateien:

  Compose_neo_greek.neo
  Compose_neo_math.neo
  Compose_neo_rom.neo

- Makefile erneuert:

  make                                kurzer Hilfetext
  make XCompose_m1_m2_m3              baut Module m1 bis m3 zusammen
  make all                            erzeuge Default-Dateien
  make clean                          räume Directory auf
  make check                          verifiziere XCompose*-Dateien

- Neues Directory `contrib':

  enthält Informationen, die veraltet sind, nicht mehr gepflegt
  werden, oder aus einem anderen Grund nicht Teil der offiziellen
  Release zu sein brauchen.

- eigene_compose_erstellen/compose.sh:

  ist nun im Grunde überflüssig, wurde nach contrib verschoben



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

1 files changed, 53 insertions, 24 deletions

diff --git a/Compose/Makefile b/Compose/Makefile
index d76676f..2fe7a00 100644
--- a/Compose/Makefile
+++ b/Compose/Makefile
@@ -1,24 +1,53 @@
-Compose_neo_math.neo: Compose.neo Compose_math_and_physics.neo
-	cat $? > $@
-	echo >> $@
-	echo "# End of Definitions by Neo keyboard layout" >> $@
-
-Compose_neo_greek.neo: Compose.neo Compose_greek.neo
-	cat $? > $@
-	echo >> $@
-	echo "# End of Definitions by Neo keyboard layout" >> $@
-
-Compose_neo_math_sprachen.neo: Compose.neo Compose_math_and_physics.neo Compose_greek.neo Compose_sprachen.neo
-	cat $? > $@
-	echo >> $@
-	echo "# End of Definitions by Neo keyboard layout" >> $@
-
-Compose_neo_sprachen.neo: Compose.neo Compose_greek.neo Compose_sprachen.neo
-	cat $? > $@
-	echo >> $@
-	echo "# End of Definitions by Neo keyboard layout" >> $@
-
-Compose_neo_rom.neo: Compose.neo Compose_many_roman_numericals.neo
-	cat $? > $@
-	echo >> $@
-	echo "# End of Definitions by Neo keyboard layout" >> $@
+
+SRC = ./src
+
+DEFAULTS = \
+	base \
+	base_math \
+	base_greek \
+	base_math_greek_lang \
+	base_greek_lang \
+	base_roman
+
+MODULES = $(notdir $(basename $(wildcard $(SRC)/*.module)))
+
+CHECKCOMPOSE = ./check-compose.pl
+
+help : 
+	@echo Available modules: $(MODULES).
+	@echo Type \`make XCompose_mod1_mod2_mod3\' to create 
+	@echo "   " compose file from modules \`mod1\', \`mod2\', and \`mod3\'.
+	@echo Type \`make all\' to create default file set.
+	@echo Type \`make clean\' to cleanup directory.
+
+all : $(addprefix XCompose_, $(DEFAULTS))
+
+XCompose%: FORCE
+	@echo Creating file $@
+	@echo -e "#\n# Automatically generated file.  Do not edit.\n#" >$@ ;\
+	for i in \
+	`echo $@ | sed -e 's/XCompose//;s/_/ /g'`;\
+	do \
+	   export fn=$(SRC)/$$i.module;\
+	   if [ -e $$fn ]; then \
+	      echo -e "\n#\n# begin include module $$i\n#\n" >>$@ ;\
+	      cat $$fn >>$@ ;\
+	      echo -e "\n#\n# end include module $$i\n#\n" >>$@ ;\
+	   else \
+	      echo "*** Warning: file $$fn not found";\
+	   fi \
+	done
+
+check :
+	@for i in XCompose*; do \
+	   $(CHECKCOMPOSE) -q $$i || (\
+	   echo Problem in file $$i. ;\
+	   echo Run \`$(CHECKCOMPOSE) $$i\' for more details. ); done
+
+clean :
+	-rm -f XCompose_*
+
+
+
+.PHONY : clean help check
+FORCE : ;
\ No newline at end of file