global: Make Makefile better and some small fixes

[h316.git] / systems / Makefile

diff --git a/systems/Makefile b/systems/Makefile
index 4d7f84ef44dea6a4725584c91a509c70a4ccc9c3..771d21b624bb8cd3fa5fc52280cf19583b90d209 100644 (file)
--- a/systems/Makefile
+++ b/systems/Makefile
@@ -1,15 +1,21 @@
 # Makefile for system generation
 
 # Targets
-export SUPER3_SYS=$(H316)/systems/super3.sys
-export SUPER2_SYS=$(H316)/systems/super2.sys
-export SUPER3_SLST=$(H316)/systems/super3.slst
-export SUPER2_SLST=$(H316)/systems/super2.slst
-export DAP_SYS=$(H316)/systems/dap.sys
-export DAP_SLST=$(H316)/systems/dap.slst
+export SUPER2_SYS=super2.sys
+export SUPER2_SLST=super2.slst
+
+export SUPER3_SYS=super3.sys
+export SUPER3_SLST=super3.slst
+
+export SUPER3_8K_SYS=super3_8k.sys
+export SUPER3_8K_SLST=super3_8k.slst
+
+export DAP_SYS=dap.sys
+export DAP_SLST=dap.slst
+export SUPER_SIMPLE_SYS=super_simple.sys
 
 # Used files 
-export LDR_APM_8K=$(H316)/slst/ldr-apm.slst
+export LDR_APM_8K=$(H316)/slst/ldr-apm_8k.slst
 export LDR_APM=$(H316)/obj/ldr-apm.obj
 export LDR_DUMY=$(H316)/obj/ldr-dumy.obj
 export PRNTNZ=$(H316)/obj/prntnz.obj
@@ -21,32 +27,44 @@ export RESTART=$(H316)/programs/tools/build/restart.obj
 export DAP16=$(H316)/obj/dap16.obj
 export IOS16=$(H316)/obj/ios-16.obj
 export DAP_LIBRARY=$(H316)/lib/iolib/lib/dap-lib.lib
-export DUMYX16=$(H316)obj/dumy-x16.obj
-export DECCL=$(H316)obj/deccl.obj
-export SETSIZ=$(H316)/obj/setsiz.obj)
-export SUPER_SYS_FOR_DAP=$(SUPER3_SYS)
+export DUMYX16=$(H316)/obj/dumy-x16.obj
+export DECCL=$(H316)/obj/deccl.obj
+export SETSIZ=$(H316)/obj/setsiz.obj
+export SUPER_SYS_FOR_DAP=$(SUPER_SIMPLE_SYS)
 
 export MAKE
 
-all: super3 super2 dap
+all: super3 super2 super3_8k dap
 
 super2: $(SUPER2_SLST)
 super3: $(SUPER3_SLST)
+super3_8k: $(SUPER3_8K_SLST)
+
 dap: $(DAP_SLST)
 
-$(DAP_SLST): $(DAP16) $(IOS16) $(DAP_LIBRARY) $(DUMYX16) $(DECCL) $(SETSIZ)\
+$(SUPER_SIMPLE_SYS): $(LDR_APM_8K) $(PAL_AP) $(LDR_APM) $(LDR_DUMY)
+       ./build_super_simple.sh
+
+$(DAP_SLST) $(DAP_SYS): $(DAP16) $(IOS16) $(DAP_LIBRARY) $(DUMYX16) $(DECCL) $(SETSIZ)\
              $(SUPER_SYS_FOR_DAP)
        ./build_dap16.sh
 
-$(SUPER2_SLST): $(LDR_APM_8K) $(LDR_APM) $(LDR_DUMY) $(PRNTNZ)\
-                $(CLEANUP) $(PAL_AP) 
+$(SUPER2_SLST) $(SUPER2_SYS): $(LDR_APM_8K) $(LDR_APM) $(LDR_DUMY) $(PRNTNZ)\
+               $(CLEANUP) $(PAL_AP) 
        ./build_super2.sh
 
-$(SUPER3_SLST): $(LDR_APM_8K) $(LDR_APM) $(LDR_DUMY) $(PRNTNZ)\
+$(SUPER3_SLST) $(SUPER3_SYS): $(LDR_APM_8K) $(LDR_APM) $(LDR_DUMY) $(PRNTNZ)\
                 $(CLEANUP2) $(BINAL) $(RESTART)
        ./build_super3.sh
 
+$(SUPER3_8K_SLST) $(SUPER3_8K_SYS): $(LDR_APM_8K) $(LDR_APM) $(LDR_DUMY) $(PRNTNZ)\
+                $(CLEANUP2) $(BINAL) $(RESTART)
+       ./build_super3_8k.sh
+
 clean:
-       @rm -f $(SUPER2_SLST) $(SUPER2_SYS) $(SUPER3_SLST) $(SUPER3_SYS)
+       @rm -f $(SUPER2_SLST) $(SUPER2_SYS) $(SUPER3_SLST) $(SUPER3_8K_SLST)\
+        $(SUPER3_SYS) $(DAP_SYS) $(DAP_SLST)\
+         $(SUPER_SIMPLE_SYS) $(SUPER3_8K_SYS)
+
+.PHONY: super3 super2 super3_8k super_simple
 
-.PHONY: super3
\ No newline at end of file