From: hachti <hachti>
Date: Fri, 15 Jun 2007 10:46:43 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://gitweb.hachti.de/?p=h316.git;a=commitdiff_plain;h=6f41bb44c6769c7ff7b60e8a23af86c98e3fbf89

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

diff --git a/Makefile b/Makefile
index b6da401..8bf28a4 100644
--- a/Makefile
+++ b/Makefile
@@ -33,8 +33,9 @@ default:
 	@$(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir)&&) /bin/true
 
 clean:
+	@mklink.sh
+	@$(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir) $@&&) true
 	@rmlink.sh
-	$(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir) $@;)
 
 %:
 	@echo $@
diff --git a/bin/asm b/bin/asm
index 08adc28..d686a53 100755
--- a/bin/asm
+++ b/bin/asm
@@ -6,6 +6,8 @@ if [ ! $1 ] ; then
     exit 2
 fi
 
+echo -e "\nAssembler: Translating \"$1\":"
+
 for n in $*; do
   if [ $n == "/v" ]; then
     VERBOSE=yes
@@ -42,18 +44,18 @@ else
   h316 $name.go > /dev/null
 fi
 
-rm -f $name.par
-rm -f $name.go
 
 if cat $name.lst | grep "NO ERRORS IN ABOVE ASSEMBLY">/dev/null 2>&1; then
 	if [ !  $2  ]; then
 		rm $name.lst
+		rm -f $name.par
+		rm -f $name.go
 	fi
-	echo "DAP-16 assembly successfull :-)"
+	echo "Assembler: Success."
 	exit 0
 fi
 cat $name.lst
-echo -e "\nDAP-16 assembly FAILED!"
+echo -e "Assembler: Failed."
 rm -f $name.obj
 exit 77
 
diff --git a/lib/Makefile b/lib/Makefile
new file mode 100644
index 0000000..24e7570
--- /dev/null
+++ b/lib/Makefile
@@ -0,0 +1,10 @@
+
+MODULES=fortran iolib
+
+%:
+	@$(foreach mod,$(MODULES),$(MAKE) -C $(mod) $@ &&) true
+
+katzelmutelbrummsilalla:
+	@$(foreach mod,$(MODULES),$(MAKE) -C $(mod)&&) true
+
+.PHONY:default
\ No newline at end of file
diff --git a/lib/common/buildlib.sh b/lib/common/buildlib.sh
index b5de533..75875a6 100755
--- a/lib/common/buildlib.sh
+++ b/lib/common/buildlib.sh
@@ -52,7 +52,7 @@ genlib(){
 case $1 in
     clean)
 	clean
-	echo "Buildlib: Cleaning up."
+#	echo "Buildlib: Cleaning up."
     ;;
     makeorg)
 	echo "Buildlib: Splitting original libraries."
diff --git a/lib/iolib/recipe/io.recipe b/lib/iolib/recipe/io.recipe
index 08ea242..34a702c 100644
--- a/lib/iolib/recipe/io.recipe
+++ b/lib/iolib/recipe/io.recipe
@@ -25,6 +25,7 @@ org/O$AI
 #org/O$AH Original ASR listing routine
 #org/O$AH
 
+# Now part of plotter.lib!
 obj/PL$MV
 obj/PL$U
 
diff --git a/pc-tools/Makefile b/pc-tools/Makefile
new file mode 100644
index 0000000..fc1f11f
--- /dev/null
+++ b/pc-tools/Makefile
@@ -0,0 +1,10 @@
+
+MODULES=boot-maker ldc2 src-filters
+
+%:
+	@$(foreach mod,$(MODULES),$(MAKE) -C $(mod) $@ &&) true
+
+katzelmutelbrummsilalla:
+	@$(foreach mod,$(MODULES),$(MAKE) -C $(mod)&&) true
+
+.PHONY:default
diff --git a/pc-tools/boot-maker/Makefile b/pc-tools/boot-maker/Makefile
index 85faced..b216c8f 100644
--- a/pc-tools/boot-maker/Makefile
+++ b/pc-tools/boot-maker/Makefile
@@ -4,7 +4,7 @@ bmaker: main.c
 	gcc  -o $@ $<
 
 clean:
-	rm -f *.o bmaker 
+	@rm -f *.o bmaker 
 
 #install: bmaker
 #	cp bmaker ../../bin
diff --git a/pc-tools/ldc2/Makefile b/pc-tools/ldc2/Makefile
index 66ba7a9..a2b218c 100644
--- a/pc-tools/ldc2/Makefile
+++ b/pc-tools/ldc2/Makefile
@@ -75,6 +75,5 @@ all: $(APP_NAME) doxy doc
 %.hh %.cpp:
 	@ echo "Missing file \"$@\"... No problem :-)"
 
-
 include $(wildcard *.dep)
 #include $(OBJECTS:.o=.dep)
\ No newline at end of file
diff --git a/pc-tools/src-filters/Makefile b/pc-tools/src-filters/Makefile
index f7f2293..e0140cb 100644
--- a/pc-tools/src-filters/Makefile
+++ b/pc-tools/src-filters/Makefile
@@ -2,11 +2,8 @@ PROGS=paron paroff load turn zstrip tab
 
 default: $(PROGS)
 
-#install: $(PROGS)
-#	cp $(PROGS) ../../bin/
-
 clean:
-	rm -f $(PROGS)
+	@rm -f $(PROGS)
 
 .PHONY: default clean
 
diff --git a/programs/plotter/src/sinus.f b/programs/plotter/src/sinus.f
index e6bf809..b721b01 100644
--- a/programs/plotter/src/sinus.f
+++ b/programs/plotter/src/sinus.f
@@ -29,7 +29,10 @@ C
 C     
 C
       CALL PL$MV(0,0)
-      CALL REBOOT
+C      CALL REBOOT
+       CALL PL$MV (0,-250)
+       PAUSE 7
+       GO TO 1000
       END
 C
 C