*** empty log message ***

[h316.git] / lib / fortran / Makefile

diff --git a/lib/fortran/Makefile b/lib/fortran/Makefile
index 068b9c4d7689a212a8d55265b59b40d7b825e111..3b16d61260986c7c84caf50947b80be747595831 100644 (file)
--- a/lib/fortran/Makefile
+++ b/lib/fortran/Makefile
@@ -11,10 +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 
+#vpunch font
 
-FRTN_COMMAND = frtn
-ASM_COMMAND  = asm
+FRTN_COMMAND = frtn_original
+ASM_COMMAND  = asm_original
 LDC_COMMAND  = ldc
 
 #############
@@ -58,14 +59,13 @@ $(OBJECT_FILES) : $(OBJ_DIR)/%.obj : $(SRC_DIR)/%.asm
        @ 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)
-
-
+       ./buildlib.sh genlib $(RECIPE_DIR)/$(basename $(notdir $@))$(RECIPE_SUFFIX)
 
 clean:
        @echo Cleaning up.
-       @rm -rf $(OBJ_DIR) $(LIB_DIR)  *.lst *.go 
-       @buildlib.sh clean
+       @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