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

diff --git a/lib/hachti/Makefile b/lib/hachti/Makefile
index 24a97d4..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 endlib 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,16 +43,18 @@ 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
 	@./buildlib.sh makeorg
 
 $(OBJECTS): $(OBJECT_FILES) $(F4_OBJECT_FILES)
-	@#$(MAKE) $(subst $$,\$$,$?)
+#	@$(MAKE) $(subst $$,\$$,$?)
 
 $(OBJECT_FILES):$(OBJ_DIR)/%.obj : $(SRC_DIR)/%.asm
-#	@echo Building: $(subst 	$$,\$$,$@)
+	@echo Building: $(subst 	$$,\$$,$@)
 	@if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi
 	@ rm -f $@
 	@ cd $(OBJ_DIR) && $(ASM_COMMAND) ../$(subst $$,\$$,$^) $(LISTING)
@@ -65,9 +69,7 @@ $(F4_OBJECT_FILES):$(OBJ_DIR)/%.obj : $(SRC_DIR)/%.f
 	@ cd $(OBJ_DIR) && $(LDC_COMMAND) $(notdir $(subst $$,\$$,$@))
 
 
-# $(ORG_OBJDIR)/lastrun
-
-$(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