X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=lib%2Fiolib%2FMakefile;h=f9c684612ba6c494007f12672463c8321377092c;hb=6d498331303bdfe3c09289e445a6438acd843868;hp=de1dfa9e876430ccee08a627bfcfc3a2dccb7a30;hpb=5c020318fba694852c055f26dad8a4da433f6121;p=h316.git

diff --git a/lib/iolib/Makefile b/lib/iolib/Makefile
index de1dfa9..f9c6846 100644
--- a/lib/iolib/Makefile
+++ b/lib/iolib/Makefile
@@ -1,39 +1,39 @@
-# Skript, das die neue Bibliothek zusammenbauen soll 
+# Skript, das die neue Bibliothek zusammenbauen soll (01.01.06)
 
-OWN = i$$pa   o$$al  o$$la  o$$pb o$$pl
+SRC_DIR = src
+OBJ_DIR = obj
+LIB_DIR = lib
 
-OWN_1=$(foreach obj, $(OWN),$(obj).asm)
-OWN_2=$(OWN_1:.asm=.obj)
-OWN_3=$(shell echo $(subst $$,\$$,$(OWN)) | dd conv=ucase 2>/dev/null) 
-#$(subst abcdefghijklmnopqrstuvwxyz,ABCDEFGHIJKLMNOPQRSTUVWXYZ,$(OWN))
+MODULES = o$$al  o$$la o$$pl o$$pb i$$pa
 
+FRTN_COMMAND = frtn
+ASM_COMMAND  = asm
+LDC_COMMAND  = ldc
 
-ORG_USE=I$$AB I$$AI O$$AB O$$AI
-
-ASM=$H316/bin/asm
+SRC_FILES = $(foreach obj, $(MODULES),$(obj).asm)
+OBJ_FILES = $(SRC_FILES:.asm=.obj)
+OBJ_FILES_FULL = $(foreach file, $(OBJ_FILES),$(OBJ_DIR)/$(file))
 
 ##########################################
 
-all: iolib
-
-iolib: $(foreach org, $(ORG_USE), original/$(org)) $(OWN_3)
-	@echo Baue Bibliothek endgültig zusammen.
-	cat $(subst $$,\$$,\
-	$(foreach og, $(ORG_USE),original/$(og))\
-	$(OWN_3)) $(H316)/snippets/endseq \
-	> iolib || rm iolib
+libs : $(OBJ_FILES_FULL)
+	buildlib.sh
 
-obj object objects : $(OWN_2)
+obj : $(OBJ_FILES_FULL)
 
-$(OWN_3): $(OWN_2)
-	cat $(subst $$,\$$,$(OWN_2)) | ldc -s
-
-$(OWN_2):%.obj:src/%.asm
-	asm $(subst $$,\$$,$^)
+$(OBJ_FILES_FULL):$(OBJ_DIR)/%.obj:$(SRC_DIR)/%.asm
+	@echo Building: $(subst $$,\$$,$@)
+	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
+	@ rm -f $@
+	@ cd $(OBJ_DIR) && $(ASM_COMMAND) ../$(subst $$,\$$,$^)
+	@ cd $(OBJ_DIR) && ldc -s -l $(notdir $(subst $$,\$$,$@))
 
 clean:
-	rm -f *.obj $(subst $$,\$$,$(OWN_3) $(foreach obj,$(OWN_2),src/$(obj))) iolib *.lst
+	@echo Cleaning up.
+	@rm -rf $(OBJ_DIR) $(LIB_DIR)  *.lst *.go 
+	@buildlib.sh clean
+org:
+	./makeorg.sh
+
+.PHONY: clean all org obj libs
 
-###########
-.PHONY: clean all obj object objects
-