*** empty log message ***

diff --git a/bin/frun b/bin/frun
index b8675f1138254335bee8ec85e1653d8a983c4a4e..b8eb11436bec36308321c9b437b8f9df6c2cf091 100755 (executable)
--- a/bin/frun
+++ b/bin/frun
@@ -8,9 +8,11 @@ fi
 
 name=`basename $1 .obj`
 
-LIBS= $H316/lib/fortran/fort.lib\
-      $H316/lib/iolib/io.lib\
-      $H316/lib/fortran/custom.lib
+LIBS="$H316/lib/fortran/lib/flib1.lib\
+       $H316/lib/fortran/lib/flib2.lib\
+       $H316/lib/fortran/lib/flib3.lib\
+       $H316/lib/iolib/io.lib\
+"
 
 echo "rest $H316/sys/super2.sys" > $name.go
 echo "at ptr $name.obj" >> $name.go
@@ -18,7 +20,7 @@ echo "go" >> $name.go
 echo "go" >> $name.go
 
 for library in $LIBS; do
-    if [ ! -e $library]; then
+    if [ ! -e "$library" ]; then
        echo "Error: $library not found!"
        exit 3;
     fi
@@ -29,7 +31,9 @@ echo "r" >> $name.go
 echo "! echo -e \"\\n************************\"" >> $name.go
 echo "run 1000" >> $name.go
 echo "! echo -e \"************************\"" >> $name.go
-echo "quit" >> $name.go
+#echo "quit" >> $name.go
+    
+    
 #cat $name.go
 h316 $name.go 
 

diff --git a/lib/fortran/Makefile b/lib/fortran/Makefile
index fa8736d3cd72a26f523bcb1cf7ea3dd0a663e850..1513de4dc6c5e096845b51fae569f45b62940763 100644 (file)
--- 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,15 +16,19 @@ OBJ_FILES_FULL = $(foreach file, $(OBJ_FILES),$(OBJ_DIR)/$(file))
 
 ##########################################
 
-default : $(OBJ_FILES_FULL)
+libs : $(OBJ_FILES_FULL)
        buildlib.sh
 
+obj : $(OBJ_FILES_FULL)
+
 
 $(OBJ_FILES_FULL):$(OBJ_DIR)/%.obj:$(SRC_DIR)/%.asm
        @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 $$,\$$,$@))
+       
 
 clean:
        @echo Cleaning up.
@@ -45,5 +49,5 @@ src/vpunch.asm: src/vpunch.1 src/vpunch.2
 org:
        ./makeorg.sh
 
-.PHONY: clean all org
+.PHONY: clean all org obj libs
 

diff --git a/lib/fortran/buildlib.sh b/lib/fortran/buildlib.sh
index 034169123045f1436c9bacd16d50eb2092c6ecbd..89485eb8ddc58695c23f9827d58b0a240401781d 100755 (executable)
--- a/lib/fortran/buildlib.sh
+++ b/lib/fortran/buildlib.sh
@@ -35,7 +35,7 @@ make_org() {
     fi
     tdir=$PWD
     cd $ORG_OBJDIR
-    cat $tdir/$ORG_LIBDIR/*$LIB_SUFFIX | ldc -s
+    cat $tdir/$ORG_LIBDIR/*$LIB_SUFFIX | ldc -s -l
     cd $tdir
 }
 

diff --git a/lib/iolib/Makefile b/lib/iolib/Makefile
index 0804d3c37653ff615fbc4a6b6a184440083caa7a..ae5956688958a38828e0b433cd8e72b77fd79202 100644 (file)
--- a/lib/iolib/Makefile
+++ b/lib/iolib/Makefile
@@ -25,7 +25,7 @@ io.lib: $(foreach org, $(ORG_USE), original/$(org)) $(OWN_3)
 obj object objects : $(OWN_2)
 
 $(OWN_3): $(OWN_2)
-       cat $(subst $$,\$$,$(OWN_2)) | ldc -s
+       cat $(subst $$,\$$,$(OWN_2)) | ldc -s -l
 
 $(OWN_2):%.obj:src/%.asm
        asm $(subst $$,\$$,$^)

diff --git a/programs/punchomat/Makefile b/programs/punchomat/Makefile
index 4704c66a790efc65497d7043826287f5bbc9437d..0301d131986121589ea7bebaae1d5044e288e363 100644 (file)
--- a/programs/punchomat/Makefile
+++ b/programs/punchomat/Makefile
@@ -3,9 +3,9 @@
 ASM=$(H316)/bin/asm
 FRTN=$(H316)/bin/frtn
 
-build/apfel2.obj : src/apfel2.f
+build/punchomat.obj : src/punchomat.f
        @if [ ! -d build ]; then mkdir build; fi
-       $(FRTN) src/apfel2.f && mv apfel2.obj build
+       $(FRTN) src/punchomat.f && mv punchomat.obj build
 
 clean :
        @rm -rf *.obj build/ *.lst *.go *.par