From: hachti <hachti>
Date: Mon, 19 Dec 2005 01:08:11 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://gitweb.hachti.de/?a=commitdiff_plain;h=dc621a23e265632aa36051c18f9af6e0e7729c9b;p=h316.git

*** empty log message ***
---

diff --git a/bin/frun b/bin/frun
index 8dfcabe..b8675f1 100755
--- a/bin/frun
+++ b/bin/frun
@@ -8,23 +8,23 @@ fi
 
 name=`basename $1 .obj`
 
+LIBS= $H316/lib/fortran/fort.lib\
+      $H316/lib/iolib/io.lib\
+      $H316/lib/fortran/custom.lib
+
 echo "rest $H316/sys/super2.sys" > $name.go
 echo "at ptr $name.obj" >> $name.go
 echo "go" >> $name.go
 echo "go" >> $name.go
-echo "at ptr $H316/lib/fortran/original/flib1" >> $name.go
-echo "go" >> $name.go
-echo "at ptr $H316/lib/fortran/original/flib2" >> $name.go
-echo "go" >> $name.go
-echo "at ptr $H316/lib/fortran/original/flib3" >> $name.go
-echo "go" >> $name.go
-if [ -e $H316/lib/iolib/io.lib ]; then
-    echo "at ptr $H316/lib/iolib/io.lib" >> $name.go
-else
-    echo "io.lib nicht gefunden!"
-    exit 3
-fi
-echo "go" >> $name.go
+
+for library in $LIBS; do
+    if [ ! -e $library]; then
+	echo "Error: $library not found!"
+	exit 3;
+    fi
+    echo "at ptr $library" >> $name.go
+    echo "go" >> $name.go
+done
 echo "r" >> $name.go
 echo "! echo -e \"\\n************************\"" >> $name.go
 echo "run 1000" >> $name.go
diff --git a/docs/manual/assembler.tex b/docs/manual/assembler.tex
index 427440e..22073e4 100644
--- a/docs/manual/assembler.tex
+++ b/docs/manual/assembler.tex
@@ -56,7 +56,7 @@ Daf
 \item nach dem ersten Durchlauf Band wieder einlegen, wieder \verb:START: drücken.
 \end{enumerate}
 \vspace{0.5cm}
-Einstellungen für's A-Register:
+Einstellungen im A-Register:
 \begin{verbatim}
 Bit  1:  Immer setzen für 2-pass-Assemblierung
 
diff --git a/lib/fortran/Makefile b/lib/fortran/Makefile
index 3ac63b1..aaec19e 100644
--- a/lib/fortran/Makefile
+++ b/lib/fortran/Makefile
@@ -33,6 +33,7 @@ clean:
 	@rm -rf $(OBJ_DIR) $(LIB_DIR)  *.lst *.go 
 	@rm -f $(SRC_DIR)/vpunch.asm $(SRC_DIR)/vpunch.2
 	@$(MAKE) -s  -C vpunch-help clean
+	@rm -r org
 
 vpunch-help/use: vpunch-help/use.c vpunch-help/font_8x16.c
 	$(MAKE) -C vpunch-help use
@@ -43,5 +44,8 @@ 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
+org:
+	makeorg.sh
+
+.PHONY: clean all org
 
diff --git a/lib/fortran/src/vpunch.2 b/lib/fortran/src/vpunch.2
index f80814a..61e140c 100644
--- a/lib/fortran/src/vpunch.2
+++ b/lib/fortran/src/vpunch.2
@@ -1,4 +1,3 @@
-	SUBR	FONT
 FONT	DEC	0,0,0,0
 	DEC	0,0,0,0
 	DEC	0,32385,-23167,-32323