global: Makefiles now support parallel compiles.

[h316.git] / lib / hachti / Makefile

diff --git a/lib/hachti/Makefile b/lib/hachti/Makefile
index fc6ebe5aff1945931684b1d9b75054353af12a7e..4a2cf53578d5d072fe8cc3c3db25b05d4c8a47f8 100644 (file)
--- 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
 
@@ -42,10 +44,10 @@ F4_OBJECT_FILES=$(foreach obj, $(F4_MODULES), $(OBJ_DIR)/$(obj).obj)
 
 all: $(LIBS)
 #      @echo $(LIBS)
-#      @echo '$(OBJECTS)'
+#      @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)
@@ -53,7 +55,7 @@ $(OBJECTS): $(OBJECT_FILES) $(F4_OBJECT_FILES)
 
 $(OBJECT_FILES):$(OBJ_DIR)/%.obj : $(SRC_DIR)/%.asm
        @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) && $(ASM_COMMAND) ../$(subst $$,\$$,$^) $(LISTING)
        @ cd $(OBJ_DIR) && $(LDC_COMMAND) $(notdir $(subst $$,\$$,$@))
@@ -61,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)  $(OBJECT_FILES)
+$(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