X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fhachti%2FMakefile;h=24a97d40d4775750c0584df37c222035e3093275;hb=eabafccaa9119c64c3964f25035a71579de18ddd;hp=c24f3be7fe55b91cee3f8ad2ef7cf3973be887f9;hpb=6f7368dad80457b5dd8f72bf3cf6cc661e36904b;p=h316.git

diff --git a/lib/hachti/Makefile b/lib/hachti/Makefile
index c24f3be..24a97d4 100644
--- a/lib/hachti/Makefile
+++ b/lib/hachti/Makefile
@@ -12,12 +12,15 @@ export ORG_OBJDIR=org
 
 export MAKE
 
-MODULES = font pl$$mv  pl$$txt  pl$$u stack matrix
+MODULES = font pl$$mv  pl$$txt  pl$$u stack matrix endlib oct
+F4_MODULES=pmat graphics
 
-FRTN_COMMAND = frtn_original
+FRTN_COMMAND = frtn
 ASM_COMMAND  = asm_original
 LDC_COMMAND  = ldc -saq
 
+include font.config
+
 #############
 
 RECIPES=$(foreach recipe,$(shell ls $(RECIPE_DIR) | egrep "recipe$$" | grep -v CVS),\
@@ -30,8 +33,9 @@ OBJECTS=$(shell cat $(RECIPES)|egrep -v '^[[:space:]]*(\#.*)*$$'|\
 #|sort -u		   
 
 OBJECT_FILES=$(foreach obj, $(MODULES), $(OBJ_DIR)/$(obj).obj)
-SOURCE_FILES=$(foreach obj, $(MODULES), $(SRC_DIR)/$(obj).asm)
-
+F4_OBJECT_FILES=$(foreach obj, $(F4_MODULES), $(OBJ_DIR)/$(obj).obj)
+#ASM_FILES=$(foreach obj, $(MODULES), $(SRC_DIR)/$(obj).asm)
+#FORTRAN_FILES=$(foreach obj, $(MODULES), $(SRC_DIR)/$(obj).f)
 #************
 #tmp: 
 #	@echo $(subst $$,\$$, $(OBJECTS))
@@ -42,23 +46,32 @@ $(ORG_OBJDIR)/lastrun: $(ORG_LIBDIR)/*
 	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
 	@./buildlib.sh makeorg
 
-$(OBJECTS): $(OBJECT_FILES)
+$(OBJECTS): $(OBJECT_FILES) $(F4_OBJECT_FILES)
 	@#$(MAKE) $(subst $$,\$$,$?)
 
-$(OBJECT_FILES) : $(OBJ_DIR)/%.obj : $(SRC_DIR)/%.asm
+$(OBJECT_FILES):$(OBJ_DIR)/%.obj : $(SRC_DIR)/%.asm
 #	@echo Building: $(subst 	$$,\$$,$@)
 	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
 	@ rm -f $@
 	@ cd $(OBJ_DIR) && $(ASM_COMMAND) ../$(subst $$,\$$,$^) $(LISTING)
 	@ cd $(OBJ_DIR) && $(LDC_COMMAND) $(notdir $(subst $$,\$$,$@))
 
+
+$(F4_OBJECT_FILES):$(OBJ_DIR)/%.obj : $(SRC_DIR)/%.f
+#	@echo Building: $(subst 	$$,\$$,$@)
+	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
+	@ rm -f $@
+	@ cd $(OBJ_DIR) && $(FRTN_COMMAND) ../$(subst $$,\$$,$^)
+	@ cd $(OBJ_DIR) && $(LDC_COMMAND) $(notdir $(subst $$,\$$,$@))
+
+
 # $(ORG_OBJDIR)/lastrun
 
 $(LIBS):$(LIB_DIR)/%.lib: $(RECIPE_DIR)/%$(RECIPE_SUFFIX)   $(OBJECTS)
 	@./buildlib.sh genlib $(RECIPE_DIR)/$(basename $(notdir $@))$(RECIPE_SUFFIX)
 
-src/font.asm:
-	@ln -sf $(shell pwd)/fonts/font_hp_charset0_2.asm $(shell pwd)/src/font.asm
+src/font.asm: font.config fonts/*.asm
+	@ln -sf $(shell pwd)/fonts/font_$(FONT).asm $(shell pwd)/src/font.asm
 
 clean:
 	@rm -rf $(OBJ_DIR) $(LIB_DIR)  *.lst *.go src/font.asm *.obj *~ *.par \