projects
/
h316.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
*** empty log message ***
[h316.git]
/
lib
/
fortran
/
Makefile
diff --git
a/lib/fortran/Makefile
b/lib/fortran/Makefile
index 068b9c4d7689a212a8d55265b59b40d7b825e111..173dc5eead487c219fb188fc85dd55e866b4320f 100644
(file)
--- a/
lib/fortran/Makefile
+++ b/
lib/fortran/Makefile
@@
-11,11
+11,11
@@
export ORG_OBJDIR=org
export MAKE
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))
#OBJ_FILES = $(SRC_FILES:.asm=.obj)
#OBJ_FILES_FULL = $(foreach file, $(OBJ_FILES),$(OBJ_DIR)/$(file))
-
##########################################
##########################################
@@
-46,26
+45,25
@@
SOURCE_FILES=$(foreach obj, $(MODULES), $(SRC_DIR)/$(obj).asm)
all: $(LIBS)
$(ORG_OBJECTS): $(ORG_LIBDIR)/*
all: $(LIBS)
$(ORG_OBJECTS): $(ORG_LIBDIR)/*
- ./buildlib.sh makeorg
+
@
./buildlib.sh makeorg
$(OBJECTS): $(OBJECT_FILES)
$(OBJECT_FILES) : $(OBJ_DIR)/%.obj : $(SRC_DIR)/%.asm
$(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 $$,\$$,$^)
@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)
$(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:
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
+ @$(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
vpunch-help/use: vpunch-help/use.c vpunch-help/font_8x16.c
$(MAKE) -C vpunch-help use