X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=lib%2Fhachti%2FMakefile;h=d813e062ad4cc449498efab8a23eab37fb7dab84;hb=6b022f3519ccbe4635ff6fc9f7bd87c89862cb85;hp=138c47c48303ef873a23050167c37055b7487335;hpb=5460594cba2e0b00899906aa123fcd8807d944e5;p=h316.git

diff --git a/lib/hachti/Makefile b/lib/hachti/Makefile
index 138c47c..d813e06 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,8 +43,8 @@ F4_OBJECT_FILES=$(foreach obj, $(F4_MODULES), $(OBJ_DIR)/$(obj).obj)
 #	@echo $(subst $$,\$$, $(OBJECTS))
 
 all: $(LIBS)
-	@echo $(LIBS)
-	@echo '$(OBJECTS)'
+#	@echo $(LIBS)
+#	@echo '$(F4_OBJECT_FILES)'
 
 $(ORG_OBJDIR)/lastrun: $(ORG_LIBDIR)/*
 	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
@@ -67,7 +69,7 @@ $(F4_OBJECT_FILES):$(OBJ_DIR)/%.obj : $(SRC_DIR)/%.f
 	@ cd $(OBJ_DIR) && $(LDC_COMMAND) $(notdir $(subst $$,\$$,$@))
 
 
-$(LIBS):$(LIB_DIR)/%.lib: $(RECIPE_DIR)/%$(RECIPE_SUFFIX)  $(OBJECT_FILES) $(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