From: hachti Date: Thu, 14 Dec 2006 07:03:09 +0000 (+0000) Subject: *** empty log message *** X-Git-Url: http://gitweb.hachti.de/?p=h316.git;a=commitdiff_plain;h=4dafd752143adb3a13d2f7203d15abbf202764e4 *** empty log message *** --- diff --git a/Makefile b/Makefile index 29336ae..aee696b 100644 --- a/Makefile +++ b/Makefile @@ -17,7 +17,7 @@ SUBDIRS+=programs/tools SUBDIRS+=systems # The compiler is rebuilt as well! -SUBDIRS+=programs/frtn +SUBDIRS+=programs/fortran # And all other H316 tools depending on all the other stuff SUBDIRS+=programs/mandelbrot\ @@ -30,13 +30,16 @@ SUBDIRS+=programs/mandelbrot\ #SUBDIRS+=docs/manual default: + @mklink.sh @$(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir)&&) /bin/true -cvsclean: clean - touch slst/* sys/* +clean: + rmlink.sh + $(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir) $@;) %: @echo $@ + @mklink.sh $(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir) $@;) diff --git a/bin/bmaker b/bin/bmaker deleted file mode 100755 index a6e85f4..0000000 Binary files a/bin/bmaker and /dev/null differ diff --git a/bin/frtn b/bin/frtn index 1f8bd7c..f89f7d1 100755 --- a/bin/frtn +++ b/bin/frtn @@ -29,7 +29,7 @@ d ss2 1 d ss3 0 d ss4 0 go -;quit +quit EOF h316 $name.go > /dev/null diff --git a/bin/ldc b/bin/ldc deleted file mode 100755 index fe93383..0000000 Binary files a/bin/ldc and /dev/null differ diff --git a/bin/mklink.sh b/bin/mklink.sh new file mode 100755 index 0000000..4280519 --- /dev/null +++ b/bin/mklink.sh @@ -0,0 +1,35 @@ +#!/bin/bash +if [ -e $H316/.links_present ]; then exit 0; fi +echo Creating links. + +ln -s -f $H316/systems/super2.sys $H316/sys +ln -s -f $H316/systems/super3.sys $H316/sys +ln -s -f $H316/systems/dap.sys $H316/sys + +ln -s -f $H316/systems/super2.slst $H316/slst +ln -s -f $H316/systems/super3.slst $H316/slst +ln -s -f $H316/systems/dap.slst $H316/slst + +ln -s -f $H316/honeywell/obj/dap16.obj $H316/obj +ln -s -f $H316/honeywell/obj/deccl.obj $H316/obj +ln -s -f $H316/honeywell/obj/dumy-x16.obj $H316/obj +ln -s -f $H316/honeywell/obj/ios-16.obj $H316/obj +ln -s -f $H316/honeywell/obj/ldr-apm.obj $H316/obj +ln -s -f $H316/honeywell/obj/ldr-dumy.obj $H316/obj +ln -s -f $H316/honeywell/obj/pal-ap.obj $H316/obj +ln -s -f $H316/honeywell/obj/prntnz.obj $H316/obj +ln -s -f $H316/honeywell/obj/setsiz.obj $H316/obj + +touch $H316/.links_present + +ln -s -f $H316/honeywell/slst/dap_8k.slst $H316/slst +ln -s -f $H316/honeywell/slst/frtn_8k.slst $H316/slst +ln -s -f $H316/honeywell/slst/ldr-apm_8k.slst $H316/slst +ln -s -f $H316/honeywell/slst/pal-ap_4k.slst $H316/slst + +ln -s -f $H316/programs/fortran/frtn.sys $H316/sys +ln -s -f $H316/programs/fortran/frtn.slst $H316/slst + +ln -s -f $H316/pc_tools/src_filters/{paron,paroff,tab,zstrip} $H316/bin +ln -s -f $H316/pc_tools/ldc/ldc $H316/bin +ln -s -f $H316/pc_tools/boot_maker/bmaker $H316/bin \ No newline at end of file diff --git a/bin/paroff b/bin/paroff deleted file mode 100755 index 2f2c1e8..0000000 Binary files a/bin/paroff and /dev/null differ diff --git a/bin/paron b/bin/paron deleted file mode 100755 index 5a3ff2d..0000000 Binary files a/bin/paron and /dev/null differ diff --git a/bin/rmlink.sh b/bin/rmlink.sh new file mode 100755 index 0000000..e24ced0 --- /dev/null +++ b/bin/rmlink.sh @@ -0,0 +1,35 @@ +#!/bin/bash +if [ ! -e $H316/.links_present ] ; then exit 0; fi +echo Removing links. + +rm -f $H316/sys/super2.sys +rm -f $H316/sys/super3.sys +rm -f $H316/sys/dap.sys +rm -f $H316/slst/super2.slst +rm -f $H316/slst/super3.slst +rm -f $H316/slst/dap.slst +rm -f $H316/obj/dap16.obj +rm -f $H316/obj/deccl.obj +rm -f $H316/obj/dumy-x16.obj +rm -f $H316/obj/ios-16.obj +rm -f $H316/obj/ldr-apm.obj +rm -f $H316/obj/ldr-dumy.obj +rm -f $H316/obj/pal-ap.obj +rm -f $H316/obj/prntnz.obj +rm -f $H316/obj/setsiz.obj + + +rm -f $H316/.links_present + +rm -f $H316/slst/dap_8k.slst +rm -f $H316/slst/frtn_8k.slst +rm -f $H316/slst/ldr-apm_8k.slst +rm -f $H316/slst/pal-ap_4k.slst + +rm -f $H316/sys/frtn.sys +rm -f $H316/sys/frtn.slst + + +rm -f $H316/bin/{paron,paroff,tab,zstrip} +rm -f $H316/bin/ldc +rm -f $H316/bin/bmaker diff --git a/bin/tab b/bin/tab deleted file mode 100755 index aaa1345..0000000 Binary files a/bin/tab and /dev/null differ diff --git a/programs/fortran/Makefile b/programs/fortran/Makefile new file mode 100644 index 0000000..9ce37a0 --- /dev/null +++ b/programs/fortran/Makefile @@ -0,0 +1,25 @@ +# Makefile für Compiler + +ASM=$(H316)/bin/asm +FRTN=$(H316)/bin/frtn + +OBJECTS=build/frtn.obj build/f4$$dum.obj build/f4$$ios-b.obj + +frtn.sys frtn.slst: $(OBJECTS) + build_frtn.sh + + +clean : + @rm -rf *.obj build/ *.lst *.go *.par frtn.sys frtn.slst + +.PHONY: default clean + +build/%.obj:src/%.f + @if [ ! -d build ]; then mkdir build; fi + $(FRTN) '$^' + mv '$(notdir $@)' build + +build/%.obj:src/%.asm + @if [ ! -d build ]; then mkdir build; fi + $(ASM) '$^' + mv '$(notdir $@)' build diff --git a/programs/fortran/build_frtn.sh b/programs/fortran/build_frtn.sh new file mode 100755 index 0000000..6767e19 --- /dev/null +++ b/programs/fortran/build_frtn.sh @@ -0,0 +1,34 @@ +#!/bin/sh + +cat > build.do <