X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=lib%2Ffortran%2FMakefile;h=3b16d61260986c7c84caf50947b80be747595831;hb=99ab10072953cf340864184e8080b2f68f643215;hp=ff01349366a8ddaa45aa52735aee8d27d34a1114;hpb=f020a29eadb9a6e0a0343e0fae9f7bf03941bde2;p=h316.git

diff --git a/lib/fortran/Makefile b/lib/fortran/Makefile
index ff01349..3b16d61 100644
--- a/lib/fortran/Makefile
+++ b/lib/fortran/Makefile
@@ -1,26 +1,78 @@
-# Skript, das die neue Bibliothek zusammenbauen soll 
+# Skript, das die neue Bibliothek zusammenbauen soll (01.01.06)
 
-OWN = f$$w4 pchar fpatch uc lpchar vpunch
-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) 
+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 = uc f$$w4 f$$w1 pchar fpatch lpchar 
+#vpunch font
+
+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))
 
-FORTRAN=$H316/bin/frtn
 
 ##########################################
 
-all : $(OWN_2)
 
-$(OWN_2):%.obj:src/%.asm
-	@echo Building: $(subst $$,\$$,$@)
-	@asm $(subst $$,\$$,$^) || rm -f $@ 
+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)
+
+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 -f $(subst $$,\$$,$(OWN_2))  *.lst *.go src/vpunch.asm
+	@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/font.asm: vpunch-help/use
+	vpunch-help/use > $@
+
+.PHONY: clean all
+
 
-src/vpunch.asm: src/vpunch.1 src/vpunch.2
-	cat src/vpunch.1 src/vpunch.2 > src/vpunch.asm
-###########
-.PHONY: clean all 
-