X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=lib%2Ffortran%2FMakefile;h=f6d8e427fae68ab3aa26b45f8c8a247ff31233d5;hb=108066a55bac2fb4514b6e3e72bc216b36d405f2;hp=2862bf94e4c79597adf127ddada8ee9ac237afab;hpb=6c33b62da23688ad28889758bc7d919110cd2e42;p=h316.git

diff --git a/lib/fortran/Makefile b/lib/fortran/Makefile
index 2862bf9..f6d8e42 100644
--- a/lib/fortran/Makefile
+++ b/lib/fortran/Makefile
@@ -1,50 +1,78 @@
-# Skript, das die neue Bibliothek zusammenbauen soll (30.05.05)
+# 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
 
-MODULES = uc f$$w4 f$$w1 pchar fpatch lpchar vpunch
+export MAKE
+
+MODULES = uc f$$w4 f$$w1 pchar fpatch lpchar 
+#vpunch font
 
 FRTN_COMMAND = frtn
 ASM_COMMAND  = asm
 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))
-#OWN_3=$(shell echo $(subst $$,\$$,$(OWN)) | dd conv=ucase 2>/dev/null) 
+
+#############
+
+#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) | 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)
 
-$(OBJ_FILES_FULL):$(OBJ_DIR)/%.obj:$(SRC_DIR)/%.asm
-	@echo Building: $(subst $$,\$$,$@)
+OBJECT_FILES=$(foreach obj, $(MODULES), $(OBJ_DIR)/$(obj).obj)
+SOURCE_FILES=$(foreach obj, $(MODULES), $(SRC_DIR)/$(obj).asm)
+
+#************
+
+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 
-	@rm -f $(SRC_DIR)/vpunch.asm $(SRC_DIR)/vpunch.2
-	@$(MAKE) -s  -C vpunch-help clean
-	@buildlib.sh clean
+	@rm -rf $(OBJ_DIR) $(LIB_DIR) src/font.asm  *.lst *.go 
+	@$(MAKE) -C vpunch-help clean
+	@./buildlib.sh clean
 
 vpunch-help/use: vpunch-help/use.c vpunch-help/font_8x16.c
 	$(MAKE) -C vpunch-help use
 
-src/vpunch.2: vpunch-help/use
-	vpunch-help/use > src/vpunch.2
+src/font.asm: vpunch-help/use
+	vpunch-help/use > $@
 
-src/vpunch.asm: src/vpunch.1 src/vpunch.2
-	cat src/vpunch.1 src/vpunch.2 > src/vpunch.asm
+.PHONY: clean all
 
-.PHONY: clean all org obj libs