global: Make Makefile better and some small fixes

Signed-off-by: Philipp Hachtmann <hachti@hachti.de>

diff --git a/.gitignore b/.gitignore
index 2c1150fe29031514be0cba8c608980e869f286e5..2d112bb02cf302f7742c916e9dd95f78cc28c5e3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 h316rc
 !.empty
 !.gitignore
+!obj
\ No newline at end of file

diff --git a/Makefile b/Makefile
index 6f781ba90e7472d3fe251fff5a90bb8d986ac1a2..cb4c049e93744e2d7200d4d21a44b0d4d97b295a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,39 +1,37 @@
 # Toplevel Makefile for Hachti's H316 stuff collection
 
-# First we need the PC side tools. Nothing runs without them!
-SUBDIRS=pc-tools 
+SUBDIRS = pc-tools lib systems programs
 
-# Now we build the libraries which are always rebuild using the original compiler and 
-# assembler tapes
-SUBDIRS+=lib
-
-# Here we link the assembler - via a trick
-SUBDIRS+=systems/dap
+# If you want to build the docs, too: Uncomment next line:
+#SUBDIRS+=docs/manual
 
-# What's missing for the systems
-SUBDIRS+=programs/tools
+.done_pc-tools :
+       @$(MAKE) -C pc-tools && touch $@
 
-# Now we can build the super images and slst
-SUBDIRS+=systems
+.done_lib: .done_pc-tools
+       @$(MAKE) -C lib && touch $@
 
-# The compiler is rebuilt as well!
-SUBDIRS+=programs/fortran
+.done_systems_dap: .done_lib
+       @$(MAKE) -C systems/dap && touch $@
 
-# And all other H316 tools depending on all the other stuff
-SUBDIRS+=programs
+.done_programs_tools: .done_systems_dap
+       @$(MAKE) -C programs/tools && touch $@
 
-#lib/fortran/vpunch-help
+.done_systems: .done_programs_tools
+       @$(MAKE) -C systems && touch $@
 
-# If you want to build the docs, too: Uncomment next line:
-#SUBDIRS+=docs/manual
+.done_programs_fortran: .done_systems
+       @$(MAKE) -C programs/fortran && touch $@
 
+.done_programs: .done_programs_fortran
+       @$(MAKE) -C programs && touch $@
 
-default: 
-       @$(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir)&&) /bin/true
+default: .done_programs
 
 clean:
        @$(foreach subdir, $(SUBDIRS), $(MAKE) -C $(subdir) $@&&) true
        @rm -f h316rc
+       @rm -f .done_*
 
 %:
        @echo $@

diff --git a/systems/Makefile b/systems/Makefile
index 5fec5b03f3c0e5839b3829c330920c92af40c3c0..771d21b624bb8cd3fa5fc52280cf19583b90d209 100644 (file)
--- a/systems/Makefile
+++ b/systems/Makefile
@@ -64,7 +64,7 @@ $(SUPER3_8K_SLST) $(SUPER3_8K_SYS): $(LDR_APM_8K) $(LDR_APM) $(LDR_DUMY) $(PRNTN
 clean:
        @rm -f $(SUPER2_SLST) $(SUPER2_SYS) $(SUPER3_SLST) $(SUPER3_8K_SLST)\
         $(SUPER3_SYS) $(DAP_SYS) $(DAP_SLST)\
-         $(SUPER_SIMPLE_SYS)
+         $(SUPER_SIMPLE_SYS) $(SUPER3_8K_SYS)
 
 .PHONY: super3 super2 super3_8k super_simple
 

diff --git a/systems/build_super3_8k.sh b/systems/build_super3_8k.sh
index 69557169f03408eeca942e61a33e5aa6ca2379a9..bab4f68780f26e8db4616d1341e3f59ad5c0b087 100755 (executable)
--- a/systems/build_super3_8k.sh
+++ b/systems/build_super3_8k.sh
@@ -161,4 +161,4 @@ EOF
 
 rm -f $TARGET_SLST
 h316 $DO_FILE
-#rm -f $DO_FILE
+rm -f $DO_FILE