Merge branch ucsim-034-pre3 to main trunk; new version 0.4

[fw/sdcc] / sim / ucsim / Makefile

diff --git a/sim/ucsim/Makefile b/sim/ucsim/Makefile
index 9f737410ee886df01400ba6fd0c50dba5e8fde30..f33bed6ef042c0a90a32031196b986dc0a5ad716 100644 (file)
--- a/sim/ucsim/Makefile
+++ b/sim/ucsim/Makefile
@@ -9,7 +9,8 @@ STARTYEAR       = 1997
 SHELL          = /bin/sh
 
 PRJDIR         = .
-PKGS           = cmd.src sim.src gui.src s51.src avr.src z80.src doc
+include packages.mk
+#PKGS          = cmd.src sim.src gui.src s51.src avr.src z80.src doc
 
 srcdir          = .
 
@@ -49,8 +50,7 @@ uninstall:
 # Deleting all files created by building the program
 # --------------------------------------------------
 clean:
-       rm -f *core *[%~] *.[oa] *.so ucsim
-       rm -f .[a-z]*~
+       $(MAKE) -f clean.mk clean
        @for pkg in $(PKGS); do\
          $(MAKE) -C $$pkg -f clean.mk clean ;\
        done
@@ -59,8 +59,7 @@ clean:
 # Deleting all files created by configuring or building the program
 # -----------------------------------------------------------------
 distclean: clean
-       rm -f config.cache config.log config.status
-       rm -f ddconfig.h main.mk *.dep
+       $(MAKE) -f clean.mk distclean
        @for pkg in $(PKGS); do\
          $(MAKE) -C $$pkg -f clean.mk distclean ;\
        done
@@ -70,6 +69,7 @@ distclean: clean
 # Like clean but some files may still exist
 # -----------------------------------------
 mostlyclean: clean
+       $(MAKE) -f clean.mk mostlyclean
        @for pkg in $(PKGS); do\
          $(MAKE) -C $$pkg -f clean.mk mostlyclean ;\
        done
@@ -79,6 +79,7 @@ mostlyclean: clean
 # everything deleted by distclean plus files created by bison, stc.
 # -----------------------------------------------------------------------
 realclean: distclean
+       $(MAKE) -f clean.mk realclean
        @for pkg in $(PKGS); do\
          $(MAKE) -C $$pkg -f clean.mk realclean ;\
        done
@@ -97,6 +98,16 @@ dist: distclean
 # Performing self-test
 # --------------------
 check:
+       $(MAKE) -f main.mk check
+       @for pkg in $(PKGS); do\
+         $(MAKE) -C $$pkg check ;\
+       done
+
+test:
+       $(MAKE) -f main.mk test
+       @for pkg in $(PKGS); do\
+         $(MAKE) -C $$pkg test ;\
+       done
 
 
 # Performing installation test
@@ -173,6 +184,7 @@ echo_freshconf:
        @echo "FRESHCONF"
 
 checkconf:
+       @echo "CHECKCONF"
        @if [ -f devel ]; then $(MAKE) freshconf; fi
 
 # End of Makefile