X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=lib%2Fhachti%2FMakefile;h=c24f3be7fe55b91cee3f8ad2ef7cf3973be887f9;hb=8eb8811723f247b223acf77c00171318fb1db645;hp=aedbe53a1a99da66c896e9a676aeb394c7bbe26a;hpb=ce1f6adb7e2647dc3b56fe7473a469b528afdbd7;p=h316.git

diff --git a/lib/hachti/Makefile b/lib/hachti/Makefile
index aedbe53..c24f3be 100644
--- a/lib/hachti/Makefile
+++ b/lib/hachti/Makefile
@@ -26,14 +26,15 @@ RECIPES=$(foreach recipe,$(shell ls $(RECIPE_DIR) | egrep "recipe$$" | grep -v C
 LIBS=$(foreach lib,$(basename $(notdir $(RECIPES))),$(LIB_DIR)/$(lib).lib)
 
 OBJECTS=$(shell cat $(RECIPES)|egrep -v '^[[:space:]]*(\#.*)*$$'|\
-                   grep $(OBJ_DIR)|sort -u)
+                   grep $(OBJ_DIR)| sort -u)
+#|sort -u		   
 
 OBJECT_FILES=$(foreach obj, $(MODULES), $(OBJ_DIR)/$(obj).obj)
 SOURCE_FILES=$(foreach obj, $(MODULES), $(SRC_DIR)/$(obj).asm)
 
 #************
 #tmp: 
-#	@echo $(OBJECT_FILES)
+#	@echo $(subst $$,\$$, $(OBJECTS))
 
 all: $(LIBS)
 
@@ -42,6 +43,7 @@ $(ORG_OBJDIR)/lastrun: $(ORG_LIBDIR)/*
 	@./buildlib.sh makeorg
 
 $(OBJECTS): $(OBJECT_FILES)
+	@#$(MAKE) $(subst $$,\$$,$?)
 
 $(OBJECT_FILES) : $(OBJ_DIR)/%.obj : $(SRC_DIR)/%.asm
 #	@echo Building: $(subst 	$$,\$$,$@)
@@ -51,15 +53,17 @@ $(OBJECT_FILES) : $(OBJ_DIR)/%.obj : $(SRC_DIR)/%.asm
 	@ 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:
 	@ln -sf $(shell pwd)/fonts/font_hp_charset0_2.asm $(shell pwd)/src/font.asm
 
 clean:
-	@rm -rf $(OBJ_DIR) $(LIB_DIR)  *.lst *.go src/font.asm *.obj *~ *.par
-	@./buildlib.sh clean
+	@rm -rf $(OBJ_DIR) $(LIB_DIR)  *.lst *.go src/font.asm *.obj *~ *.par \
+	$(SRC_DIR)/*~ $(RECIPE_DIR)/*~
+	@./buildlib.sh clean 
 
 .PHONY: clean all