From: hachti Date: Thu, 6 Nov 2008 07:11:54 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://gitweb.hachti.de/?a=commitdiff_plain;h=5460594cba2e0b00899906aa123fcd8807d944e5;p=h316.git *** empty log message *** --- diff --git a/lib/hachti/Makefile b/lib/hachti/Makefile index 54910eb..138c47c 100644 --- a/lib/hachti/Makefile +++ b/lib/hachti/Makefile @@ -41,6 +41,8 @@ F4_OBJECT_FILES=$(foreach obj, $(F4_MODULES), $(OBJ_DIR)/$(obj).obj) # @echo $(subst $$,\$$, $(OBJECTS)) all: $(LIBS) + @echo $(LIBS) + @echo '$(OBJECTS)' $(ORG_OBJDIR)/lastrun: $(ORG_LIBDIR)/* @if [ ! -d $(OBJ_DIR) ]; then mkdir $(OBJ_DIR); fi @@ -50,7 +52,7 @@ $(OBJECTS): $(OBJECT_FILES) $(F4_OBJECT_FILES) # @$(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,7 +67,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) $(OBJECTS) +$(LIBS):$(LIB_DIR)/%.lib: $(RECIPE_DIR)/%$(RECIPE_SUFFIX) $(OBJECT_FILES) $(OBJECTS) @./buildlib.sh genlib $(RECIPE_DIR)/$(basename $(notdir $@))$(RECIPE_SUFFIX) src/font.asm: font.config fonts/*.asm