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

diff --git a/lib/iolib/Makefile b/lib/iolib/Makefile
index de1dfa9..67b72fe 100644
--- a/lib/iolib/Makefile
+++ b/lib/iolib/Makefile
@@ -1,39 +1,71 @@
-# 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
+export SRC_DIR = src
+export OBJ_DIR = obj
+export LIB_DIR = lib
+export RECIPE_DIR = recipe
+export RECIPE_SUFFIX=.recipe
+export ENDBLOCK=$(H316)/snippets/endseq
+export ORG_LIBDIR=original
+export ORG_OBJDIR=org
 
-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))
+export MAKE
 
+MODULES = o$$al  o$$la o$$pl o$$pb i$$pa
 
-ORG_USE=I$$AB I$$AI O$$AB O$$AI
+FRTN_COMMAND = frtn_original
+ASM_COMMAND  = asm_original
+LDC_COMMAND  = ldc
+
+#############
+
+#SRC_FILES = $(foreach obj, $(MODULES),$(obj).asm)
+#OBJ_FILES = $(SRC_FILES:.asm=.obj)
+#OBJ_FILES_FULL = $(foreach file, $(OBJ_FILES),$(OBJ_DIR)/$(file))
 
-ASM=$H316/bin/asm
 
 ##########################################
 
-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
+RECIPES=$(foreach recipe,$(shell ls $(RECIPE_DIR) | egrep "recipe$$" | grep -v CVS),\
+        $(RECIPE_DIR)/$(recipe))
+
+LIBS=$(foreach lib,$(basename $(notdir $(RECIPES))),$(LIB_DIR)/$(lib).lib)
+
+ORG_OBJECTS=$(shell cat $(RECIPES)|egrep -v '^[[:space:]]*(\#.*)*$$'|\
+                   grep $(ORG_OBJDIR)|sort -u)	
+
+OBJECTS=$(shell cat $(RECIPES)|egrep -v '^[[:space:]]*(\#.*)*$$'|\
+                   grep $(OBJ_DIR)|sort -u)
+
+OBJECT_FILES=$(foreach obj, $(MODULES), $(OBJ_DIR)/$(obj).obj)
+SOURCE_FILES=$(foreach obj, $(MODULES), $(SRC_DIR)/$(obj).asm)
 
-obj object objects : $(OWN_2)
+#************
 
-$(OWN_3): $(OWN_2)
-	cat $(subst $$,\$$,$(OWN_2)) | ldc -s
+all: $(LIBS)
+
+$(ORG_OBJECTS): $(ORG_LIBDIR)/*
+	./buildlib.sh makeorg
+
+$(OBJECTS): $(OBJECT_FILES)
+
+$(OBJECT_FILES) : $(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 $$,\$$,$@))
+
+$(LIBS):$(LIB_DIR)/%.lib: $(RECIPE_DIR)/%$(RECIPE_SUFFIX) $(ORG_OBJECTS) $(OBJECTS) 
+	./buildlib.sh genlib $(RECIPE_DIR)/$(basename $(notdir $@))$(RECIPE_SUFFIX)
 
-$(OWN_2):%.obj:src/%.asm
-	asm $(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
+
+.PHONY: clean all
+
 
-###########
-.PHONY: clean all obj object objects
-