*** empty log message ***

[h316.git] / Makefile

diff --git a/Makefile b/Makefile
index 308ff69c3f6210579f3cfc9785496f02e9ecffae..f9a129abbc3a34c6c2284d3b5e9e69156cfa63cc 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,51 @@
 # 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 
+
+# Now we build the libraries which are always rebuild using the original compiler and 
+# assembler tapes
+SUBDIRS+=lib/iolib lib/fortran \
+
+# Here we link the assembler - via a trick
+SUBDIRS+=systems/dap
+
+# What's missing for the systems
+SUBDIRS+=programs/tools
+
+# Now we can build the super images and slst
+SUBDIRS+=systems
+
+# The compiler is rebuilt as well!
+SUBDIRS+=programs/frtn
+
+# 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
 
 #lib/fortran/vpunch-help
 
 # If you want to build the docs, too: Uncomment next line:
 #SUBDIRS+=docs/manual
+cvsclean: clean
+       touch slst/* sys/*
 
 default: 
-       $(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir)&&) /bin/true
+       @$(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir)&&) /bin/true
 
 %:
        @echo $@
        $(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir) $@;)
 
 
-.PHONY: default
+.PHONY: default cvsclean