Changed everything towards LDC2 use.

[h316.git] / lib / fortran / Makefile

diff --git a/lib/fortran/Makefile b/lib/fortran/Makefile
index ce43c0325b5ee3ca5495ec814f00ec292f2e56f9..3767ecd2be33b13bda0c3d9797f0c10c60ceb247 100644 (file)
--- 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
 
 #############
 
@@ -46,25 +46,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.
-       @rm -rf $(OBJ_DIR) $(LIB_DIR)  *.lst *.go 
+#      @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