X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=lib%2Fiolib%2FMakefile;h=587fc2a3946b029ea8e67f6dccfa8fb0b28095f7;hb=89a5bbfa365be9adc5bc5e2d727aa78c6c3c8e7e;hp=96755930d52b00b6938537aad96328dde220c31b;hpb=31074970a727e80618c11cb3af64f15cb069ac3d;p=h316.git

diff --git a/lib/iolib/Makefile b/lib/iolib/Makefile
index 9675593..587fc2a 100644
--- a/lib/iolib/Makefile
+++ b/lib/iolib/Makefile
@@ -1,3 +1,4 @@
+
 # Skript, das die neue Bibliothek zusammenbauen soll (01.01.06)
 
 export SRC_DIR = src
@@ -11,11 +12,11 @@ export ORG_OBJDIR=org
 
 export MAKE
 
-MODULES = o$$al  o$$la o$$pl o$$pb i$$pa pl$$up
+MODULES = o$$al  o$$la o$$pl o$$pb i$$pa
 
 FRTN_COMMAND = frtn_original
 ASM_COMMAND  = asm_original
-LDC_COMMAND  = ldc
+LDC_COMMAND  = ldc -saq
 
 #############
 
@@ -32,8 +33,8 @@ RECIPES=$(foreach recipe,$(shell ls $(RECIPE_DIR) | egrep "recipe$$" | grep -v C
 
 LIBS=$(foreach lib,$(basename $(notdir $(RECIPES))),$(LIB_DIR)/$(lib).lib)
 
-ORG_OBJECTS=$(shell cat $(RECIPES)|egrep -v '^[[:space:]]*(\#.*)*$$'|\
-                   grep $(ORG_OBJDIR)|sort -u)	
+#ORG_OBJECTS=$(shell cat $(RECIPES)|egrep -v '^[[:space:]]*(\#.*)*$$'|\
+#                   grep $(ORG_OBJDIR)|sort -u)	
 
 OBJECTS=$(shell cat $(RECIPES)|egrep -v '^[[:space:]]*(\#.*)*$$'|\
                    grep $(OBJ_DIR)|sort -u)
@@ -45,27 +46,32 @@ SOURCE_FILES=$(foreach obj, $(MODULES), $(SRC_DIR)/$(obj).asm)
 
 all: $(LIBS)
 
-$(ORG_OBJECTS): $(ORG_LIBDIR)/*
-	./buildlib.sh makeorg
+
+$(ORG_OBJDIR)/lastrun: $(ORG_LIBDIR)/*
+	@./buildlib.sh makeorg
+
+#$(ORG_OBJECTS): $(ORG_LIBDIR)/*
+#	
+#	@echo '$(ORG_OBJECTS)'
 
 $(OBJECTS): $(OBJECT_FILES)
 
 $(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 $$,\$$,$^)
-	@ cd $(OBJ_DIR) && ldc -s -l $(notdir $(subst $$,\$$,$@))
+	@ cd $(OBJ_DIR) && $(ASM_COMMAND) ../$(subst $$,\$$,$^) $(LISTING)
+	@ cd $(OBJ_DIR) && $(LDC_COMMAND) $(notdir $(subst $$,\$$,$@))
 
-$(LIBS):$(LIB_DIR)/%.lib: $(RECIPE_DIR)/%$(RECIPE_SUFFIX) $(ORG_OBJECTS) $(OBJECTS) 
-	./buildlib.sh genlib $(RECIPE_DIR)/$(basename $(notdir $@))$(RECIPE_SUFFIX)
+$(LIBS):$(LIB_DIR)/%.lib: $(RECIPE_DIR)/%$(RECIPE_SUFFIX) $(ORG_OBJDIR)/lastrun $(OBJECTS)
+	@./buildlib.sh genlib $(RECIPE_DIR)/$(basename $(notdir $@))$(RECIPE_SUFFIX)
 
 
 clean:
-	@echo Cleaning up.
-	@rm -rf $(OBJ_DIR) $(LIB_DIR)  *.lst *.go 
+	@rm -rf $(OBJ_DIR) $(LIB_DIR)  *.lst *.go *.obj *.par *~
 	@./buildlib.sh clean
 
 .PHONY: clean all
 
+.PRECIOUS: org/lastrun