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

diff --git a/lib/iolib/Makefile b/lib/iolib/Makefile
index f9c6846..67b72fe 100644
--- a/lib/iolib/Makefile
+++ b/lib/iolib/Makefile
@@ -1,39 +1,71 @@
 # Skript, das die neue Bibliothek zusammenbauen soll (01.01.06)
 
-SRC_DIR = src
-OBJ_DIR = obj
-LIB_DIR = lib
+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
+
+export MAKE
 
 MODULES = o$$al  o$$la o$$pl o$$pb i$$pa
 
-FRTN_COMMAND = frtn
-ASM_COMMAND  = asm
+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))
+#############
+
+#SRC_FILES = $(foreach obj, $(MODULES),$(obj).asm)
+#OBJ_FILES = $(SRC_FILES:.asm=.obj)
+#OBJ_FILES_FULL = $(foreach file, $(OBJ_FILES),$(OBJ_DIR)/$(file))
+
 
 ##########################################
 
-libs : $(OBJ_FILES_FULL)
-	buildlib.sh
 
-obj : $(OBJ_FILES_FULL)
+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_FILES_FULL):$(OBJ_DIR)/%.obj:$(SRC_DIR)/%.asm
-	@echo Building: $(subst $$,\$$,$@)
+#************
+
+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)
+
+
 clean:
 	@echo Cleaning up.
 	@rm -rf $(OBJ_DIR) $(LIB_DIR)  *.lst *.go 
-	@buildlib.sh clean
-org:
-	./makeorg.sh
+	@./buildlib.sh clean
+
+.PHONY: clean all
 
-.PHONY: clean all org obj libs