X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=lib%2Ffortran%2FMakefile;h=173dc5eead487c219fb188fc85dd55e866b4320f;hb=f4c2dcf3f0d4513b1237872d4ce35335b395c6c3;hp=11fb9c169c2089d5fcdf4d888ac1d614826cede2;hpb=e8baeca7ed5bb493afe847025e520bfa984b79a9;p=h316.git

diff --git a/lib/fortran/Makefile b/lib/fortran/Makefile
index 11fb9c1..173dc5e 100644
--- a/lib/fortran/Makefile
+++ b/lib/fortran/Makefile
@@ -11,11 +11,11 @@ export ORG_OBJDIR=org
 
 export MAKE
 
-MODULES = uc f$$w4 f$$w1 pchar fpatch lpchar vpunch font
+MODULES = uc f$$w4 f$$w1 pchar fpatch lpchar reboot vpunch font
 
-FRTN_COMMAND = frtn
-ASM_COMMAND  = asm
-LDC_COMMAND  = ldc
+FRTN_COMMAND = frtn_original
+ASM_COMMAND  = asm_original
+LDC_COMMAND  = ldc -saq
 
 #############
 
@@ -23,7 +23,6 @@ LDC_COMMAND  = ldc
 #OBJ_FILES = $(SRC_FILES:.asm=.obj)
 #OBJ_FILES_FULL = $(foreach file, $(OBJ_FILES),$(OBJ_DIR)/$(file))
 
-
 ##########################################
 
 
@@ -46,25 +45,24 @@ SOURCE_FILES=$(foreach obj, $(MODULES), $(SRC_DIR)/$(obj).asm)
 all: $(LIBS)
 
 $(ORG_OBJECTS): $(ORG_LIBDIR)/*
-	./buildlib.sh makeorg
+	@./buildlib.sh makeorg
 
 $(OBJECTS): $(OBJECT_FILES)
 
 $(OBJECT_FILES) : $(OBJ_DIR)/%.obj : $(SRC_DIR)/%.asm
-	@echo Building: $(subst 	$$,\$$,$@)
+#	@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 $$,\$$,$@))
+	@ cd $(OBJ_DIR) && $(LDC_COMMAND) $(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.
+#	@echo Cleaning up.
 	@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