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

diff --git a/lib/fortran/Makefile b/lib/fortran/Makefile
index ff01349..3ac63b1 100644
--- a/lib/fortran/Makefile
+++ b/lib/fortran/Makefile
@@ -1,26 +1,47 @@
-# Skript, das die neue Bibliothek zusammenbauen soll 
+# Skript, das die neue Bibliothek zusammenbauen soll (30.05.05)
 
-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) 
+SRC_DIR = src
+OBJ_DIR = obj
+LIB_DIR = lib
+
+MODULES = f$$w4 f$$w1 pchar fpatch uc lpchar vpunch
 
-FORTRAN=$H316/bin/frtn
+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) 
 
 ##########################################
 
-all : $(OWN_2)
+all : $(OBJ_FILES_FULL)
+
+test:
+	@echo $(OBJ_FILES)
+
 
-$(OWN_2):%.obj:src/%.asm
+$(OBJ_FILES_FULL):$(OBJ_DIR)/%.obj:$(SRC_DIR)/%.asm
 	@echo Building: $(subst $$,\$$,$@)
-	@asm $(subst $$,\$$,$^) || rm -f $@ 
+	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
+	@ rm -f $@
+	@ cd $(OBJ_DIR) && $(ASM_COMMAND) ../$(subst $$,\$$,$^)
 
 clean:
 	@echo Cleaning up.
-	@rm -f $(subst $$,\$$,$(OWN_2))  *.lst *.go src/vpunch.asm
+	@rm -rf $(OBJ_DIR) $(LIB_DIR)  *.lst *.go 
+	@rm -f $(SRC_DIR)/vpunch.asm $(SRC_DIR)/vpunch.2
+	@$(MAKE) -s  -C vpunch-help 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/vpunch.asm: src/vpunch.1 src/vpunch.2
 	cat src/vpunch.1 src/vpunch.2 > src/vpunch.asm
-###########
-.PHONY: clean all 
- 
+
+.PHONY: clean all
+