X-Git-Url: http://gitweb.hachti.de/?a=blobdiff_plain;f=Makefile;h=8480e37c3cda585ca91fa79352c34fbd2550b872;hb=34bd95b6c92b130c18e1a7867a4caca1bca516ad;hp=f9a129abbc3a34c6c2284d3b5e9e69156cfa63cc;hpb=fa105a9b1957e54e3a63fdcda359fd0abc453a44;p=h316.git

diff --git a/Makefile b/Makefile
index f9a129a..8480e37 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,5 @@
 # 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 
 
@@ -18,31 +17,27 @@ 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:
+	rmlink.sh
+	$(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir) $@;)
+
 %:
 	@echo $@
+	@mklink.sh
 	$(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir) $@;)