X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=Makefile;h=c092b95f9e9a3e3a76ae78e73ba5f36541562d77;hb=3c5f7d028c961fc369ae184e4ab585166219dc7c;hp=f9a129abbc3a34c6c2284d3b5e9e69156cfa63cc;hpb=fa105a9b1957e54e3a63fdcda359fd0abc453a44;p=h316.git

diff --git a/Makefile b/Makefile
index f9a129a..c092b95 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,11 @@
 # Toplevel Makefile for Hachti's H316 stuff collection
 
-<<<<<<< Makefile
 # First we need the PC side tools. Nothing runs without them!
-SUBDIRS=pc-tools/ldc pc-tools/src-filters  pc-tools/boot-maker 
+SUBDIRS=pc-tools 
 
 # Now we build the libraries which are always rebuild using the original compiler and 
 # assembler tapes
-SUBDIRS+=lib/iolib lib/fortran \
+SUBDIRS+=lib
 
 # Here we link the assembler - via a trick
 SUBDIRS+=systems/dap
@@ -18,31 +17,30 @@ 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\
-        programs/punchomat\
-
-
-=======
-SUBDIRS=pc-tools/ldc pc-tools/src-filters  pc-tools/boot-maker lib/iolib lib/fortran \
-        lib/fortran  lib/iolib programs/mandelbrot\
-        programs/punchomat programs/tools systems
->>>>>>> 1.12
+SUBDIRS+=programs
 
 #lib/fortran/vpunch-help
 
 # If you want to build the docs, too: Uncomment next line:
 #SUBDIRS+=docs/manual
-cvsclean: clean
-	touch slst/* sys/*
+
 
 default: 
+	@mklink.sh
 	@$(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir)&&) /bin/true
 
+clean:
+	@mklink.sh
+	@$(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir) $@&&) true
+	@rm -f h316rc
+	@rmlink.sh
+
 %:
 	@echo $@
+	@mklink.sh
 	$(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir) $@;)