X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fhachti%2FMakefile;h=4a2cf53578d5d072fe8cc3c3db25b05d4c8a47f8;hb=4ad624fd6d8bf4db02fe531b51f363ba9d89707e;hp=aedbe53a1a99da66c896e9a676aeb394c7bbe26a;hpb=8dc281af5fb8e214e88da24bc72f78a955514ce8;p=h316.git

diff --git a/lib/hachti/Makefile b/lib/hachti/Makefile
index aedbe53..4a2cf53 100644
--- a/lib/hachti/Makefile
+++ b/lib/hachti/Makefile
@@ -12,12 +12,17 @@ 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 oct liblok tt$$low\
+	  megastore
+
+F4_MODULES=pmat graphics
 
 FRTN_COMMAND = frtn_original
 ASM_COMMAND  = asm_original
 LDC_COMMAND  = ldc -saq
 
+include font.config
+
 #############
 
 RECIPES=$(foreach recipe,$(shell ls $(RECIPE_DIR) | egrep "recipe$$" | grep -v CVS),\
@@ -26,40 +31,54 @@ RECIPES=$(foreach recipe,$(shell ls $(RECIPE_DIR) | egrep "recipe$$" | grep -v C
 LIBS=$(foreach lib,$(basename $(notdir $(RECIPES))),$(LIB_DIR)/$(lib).lib)
 
 OBJECTS=$(shell cat $(RECIPES)|egrep -v '^[[:space:]]*(\#.*)*$$'|\
-                   grep $(OBJ_DIR)|sort -u)
+                   grep $(OBJ_DIR)| sort -u)
+#|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 $(OBJECT_FILES)
+#	@echo $(subst $$,\$$, $(OBJECTS))
 
 all: $(LIBS)
+#	@echo $(LIBS)
+#	@echo '$(F4_OBJECT_FILES)'
 
 $(ORG_OBJDIR)/lastrun: $(ORG_LIBDIR)/*
-	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
+	@if [ ! -d $(OBJ_DIR) ]; then mkdir -p $(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
-#	@echo Building: $(subst 	$$,\$$,$@)
-	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
+$(OBJECT_FILES):$(OBJ_DIR)/%.obj : $(SRC_DIR)/%.asm
+	@echo Building: $(subst 	$$,\$$,$@)
+	@if [ ! -d $(OBJ_DIR) ]; then mkdir -p $(OBJ_DIR); fi
 	@ rm -f $@
 	@ cd $(OBJ_DIR) && $(ASM_COMMAND) ../$(subst $$,\$$,$^) $(LISTING)
 	@ cd $(OBJ_DIR) && $(LDC_COMMAND) $(notdir $(subst $$,\$$,$@))
 
-# $(ORG_OBJDIR)/lastrun
-$(LIBS):$(LIB_DIR)/%.lib: $(RECIPE_DIR)/%$(RECIPE_SUFFIX)  $(OBJECTS) 
+
+$(F4_OBJECT_FILES):$(OBJ_DIR)/%.obj : $(SRC_DIR)/%.f
+#	@echo Building: $(subst 	$$,\$$,$@)
+	@if [ ! -d $(OBJ_DIR) ]; then mkdir -p $(OBJ_DIR); fi
+	@ rm -f $@
+	@ cd $(OBJ_DIR) && $(FRTN_COMMAND) ../$(subst $$,\$$,$^)
+	@ cd $(OBJ_DIR) && $(LDC_COMMAND) $(notdir $(subst $$,\$$,$@))
+
+
+$(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
-	@./buildlib.sh clean
+	@rm -rf $(OBJ_DIR) $(LIB_DIR)  *.lst *.go src/font.asm *.obj *~ *.par \
+	$(SRC_DIR)/*~ $(RECIPE_DIR)/*~
+	@./buildlib.sh clean 
 
 .PHONY: clean all