X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=lib%2Ffortran%2FMakefile;h=2862bf94e4c79597adf127ddada8ee9ac237afab;hb=95b7f764a7157cda8c9641d6a8045ea12dfd8ffe;hp=3ac63b1b29a3b985458d30a8b51c43d08b82d2da;hpb=437b3ba835f66625031f4711cd0a963be67ccf5a;p=h316.git

diff --git a/lib/fortran/Makefile b/lib/fortran/Makefile
index 3ac63b1..2862bf9 100644
--- a/lib/fortran/Makefile
+++ b/lib/fortran/Makefile
@@ -4,7 +4,7 @@ SRC_DIR = src
 OBJ_DIR = obj
 LIB_DIR = lib
 
-MODULES = f$$w4 f$$w1 pchar fpatch uc lpchar vpunch
+MODULES = uc f$$w4 f$$w1 pchar fpatch lpchar vpunch
 
 FRTN_COMMAND = frtn
 ASM_COMMAND  = asm
@@ -16,10 +16,10 @@ OBJ_FILES_FULL = $(foreach file, $(OBJ_FILES),$(OBJ_DIR)/$(file))
 
 ##########################################
 
-all : $(OBJ_FILES_FULL)
+libs : $(OBJ_FILES_FULL)
+	buildlib.sh
 
-test:
-	@echo $(OBJ_FILES)
+obj : $(OBJ_FILES_FULL)
 
 
 $(OBJ_FILES_FULL):$(OBJ_DIR)/%.obj:$(SRC_DIR)/%.asm
@@ -27,12 +27,15 @@ $(OBJ_FILES_FULL):$(OBJ_DIR)/%.obj:$(SRC_DIR)/%.asm
 	@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 $$,\$$,$@))
+	
 
 clean:
 	@echo Cleaning up.
 	@rm -rf $(OBJ_DIR) $(LIB_DIR)  *.lst *.go 
 	@rm -f $(SRC_DIR)/vpunch.asm $(SRC_DIR)/vpunch.2
 	@$(MAKE) -s  -C vpunch-help clean
+	@buildlib.sh clean
 
 vpunch-help/use: vpunch-help/use.c vpunch-help/font_8x16.c
 	$(MAKE) -C vpunch-help use
@@ -43,5 +46,5 @@ src/vpunch.2: vpunch-help/use
 src/vpunch.asm: src/vpunch.1 src/vpunch.2
 	cat src/vpunch.1 src/vpunch.2 > src/vpunch.asm
 
-.PHONY: clean all
+.PHONY: clean all org obj libs