X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=lib%2Fhachti%2FMakefile;h=4a2cf53578d5d072fe8cc3c3db25b05d4c8a47f8;hb=0f7b7e093c962c7883622efd53cf74597d433799;hp=54910ebdd0b0c1ea21acecbbbf88b833406a2556;hpb=920d9d917816047e4c0faa2eb66b72b2406bd601;p=h316.git

diff --git a/lib/hachti/Makefile b/lib/hachti/Makefile
index 54910eb..4a2cf53 100644
--- a/lib/hachti/Makefile
+++ b/lib/hachti/Makefile
@@ -12,10 +12,12 @@ export ORG_OBJDIR=org
 
 export MAKE
 
-MODULES = font pl$$mv  pl$$txt  pl$$u stack matrix oct
+MODULES = font pl$$mv  pl$$txt  pl$$u stack matrix oct liblok tt$$low\
+	  megastore
+
 F4_MODULES=pmat graphics
 
-FRTN_COMMAND = frtn
+FRTN_COMMAND = frtn_original
 ASM_COMMAND  = asm_original
 LDC_COMMAND  = ldc -saq
 
@@ -41,17 +43,19 @@ F4_OBJECT_FILES=$(foreach obj, $(F4_MODULES), $(OBJ_DIR)/$(obj).obj)
 #	@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) $(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
+	@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 $$,\$$,$@))
@@ -59,13 +63,13 @@ $(OBJECT_FILES):$(OBJ_DIR)/%.obj : $(SRC_DIR)/%.asm
 
 $(F4_OBJECT_FILES):$(OBJ_DIR)/%.obj : $(SRC_DIR)/%.f
 #	@echo Building: $(subst 	$$,\$$,$@)
-	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
+	@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)
+$(LIBS):$(LIB_DIR)/%.lib: $(RECIPE_DIR)/%$(RECIPE_SUFFIX)  $(OBJECTS)
 	@./buildlib.sh genlib $(RECIPE_DIR)/$(basename $(notdir $@))$(RECIPE_SUFFIX)
 
 src/font.asm: font.config fonts/*.asm