Changed everything towards LDC2 use.

[h316.git] / lib / iolib / Makefile

diff --git a/lib/iolib/Makefile b/lib/iolib/Makefile
index 5a2d8835e7d89010f98be029631ab6b3bc84dcd6..91d029972eee337b7207c1e37282ae5957013126 100644 (file)
--- a/lib/iolib/Makefile
+++ b/lib/iolib/Makefile
@@ -15,7 +15,7 @@ MODULES = o$$al  o$$la o$$pl o$$pb i$$pa pl$$u pl$$mv
 
 FRTN_COMMAND = frtn_original
 ASM_COMMAND  = asm_original
-LDC_COMMAND  = ldc
+LDC_COMMAND  = ldc -saq
 
 #############
 
@@ -32,8 +32,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 +45,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) && $(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 
        @./buildlib.sh clean
 
 .PHONY: clean all
 
+.PRECIOUS: org/lastrun