X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=lib%2Ffortran%2FMakefile;h=fac03b82fb755f5a7f843c3676edf92b65b5a56c;hb=8fac3a64e23edb8f2cd4cdc28631d603075de709;hp=068b9c4d7689a212a8d55265b59b40d7b825e111;hpb=9f86bf48280620f82e50c848f3d281c217f79151;p=h316.git

diff --git a/lib/fortran/Makefile b/lib/fortran/Makefile
index 068b9c4..fac03b8 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,12 +23,11 @@ LDC_COMMAND  = ldc
 #OBJ_FILES = $(SRC_FILES:.asm=.obj)
 #OBJ_FILES_FULL = $(foreach file, $(OBJ_FILES),$(OBJ_DIR)/$(file))
 
-
 ##########################################
 
 
-RECIPES=$(foreach recipe,$(shell ls $(RECIPE_DIR) | grep -v CVS),\
-        $(RECIPE_DIR)/$(recipe))
+RECIPES=$(foreach recipe,$(shell ls $(RECIPE_DIR)/*$(RECIPE_SUFFIX) | grep -v CVS),\
+        $(recipe))
 
 LIBS=$(foreach lib,$(basename $(notdir $(RECIPES))),$(LIB_DIR)/$(lib).lib)
 
@@ -46,26 +45,25 @@ 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) && $(ASM_COMMAND) ../$(subst $$,\$$,$^) $(LISTING)
+	@ 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)
-
-
+	./buildlib.sh genlib $(RECIPE_DIR)/$(basename $(notdir $@))$(RECIPE_SUFFIX)
 
 clean:
-	@echo Cleaning up.
-	@rm -rf $(OBJ_DIR) $(LIB_DIR)  *.lst *.go 
-	@buildlib.sh clean
+#	@echo Cleaning up.
+	@rm -rf $(OBJ_DIR) $(LIB_DIR) src/font.asm  *.lst *.go *.obj *.par 
+	@$(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