Fixed Makefile. Most dests should run again

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@303 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/Makefile b/Makefile
index 0b34350ae74a1adb9d06ec4a47f728b019a4326f..81db02c1f59985c2c495b9afe2fcf1a41e29f493 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,11 +6,13 @@ SHELL         = /bin/sh
 AUTOCONF       = autoconf
 
 PRJDIR         = .
-PKGS           = debugger/mcs51 sim/ucsim
+SDCC_MISC      = debugger/mcs51 sim/ucsim
 SDCC_LIBS      = support/cpp
 SDCC_ASLINK    = as/mcs51 as link
 
-PRJS           = sim/ucsim
+PKGS           = $(SDCC_MISC) $(SDCC_LIBS) $(SDCC_ASLINK) \
+                 src device/include device/lib
+
 PORTS          = mcs51 z80
 
 srcdir          = .
@@ -34,14 +36,13 @@ sdcc-aslink:
        for as in $(SDCC_ASLINK); do $(MAKE) -C $$as; done
 
 sdcc-misc:
-       for pkg in $(PKGS); do $(MAKE) -C $$pkg; done
-       $(MAKE) -C sim/ucsim
+       for misc in $(SDCC_MISC); do $(MAKE) -C $$misc; done
 
 sdcc-device:
        $(MAKE) -C device/include
        $(MAKE) -C device/lib
 
-sdcc: sdcc-cc sdcc-aslink sdcc-misc sdcc
+sdcc: sdcc-cc sdcc-aslink sdcc-misc sdcc-device
        $(MAKE) -f main.mk all
 
 # Some interesting sub rules
@@ -74,10 +75,6 @@ clean:
        for pkg in $(PKGS); do\
          $(MAKE) PORTS="$(PORTS)" -C $$pkg clean ;\
        done
-       @echo "+ Cleaning sub-projects using Makefile..."
-       for prj in $(PRJS); do\
-         $(MAKE) -C $$prj clean ;\
-       done
 
 
 # Deleting all files created by configuring or building the program
@@ -89,10 +86,6 @@ distclean:
        for pkg in $(PKGS); do\
          $(MAKE) -C $$pkg -f clean.mk PORTS="$(PORTS)" distclean ;\
        done
-       @echo "+ DistCleaning sub-projects using Makefile..."
-       for prj in $(PRJS); do\
-         $(MAKE) -C $$prj distclean ;\
-       done
 
 
 # Like clean but some files may still exist
@@ -102,9 +95,6 @@ mostlyclean: clean
        for pkg in $(PKGS); do\
          $(MAKE) -C $$pkg -f clean.mk PORTS="$(PORTS)" mostlyclean ;\
        done
-       for prj in $(PRJS); do\
-         $(MAKE) -C $$prj mostlyclean ;\
-       done
 
 
 # Deleting everything that can reconstructed by this Makefile. It deletes
@@ -115,9 +105,6 @@ realclean: distclean
        for pkg in $(PKGS); do\
          $(MAKE) -C $$pkg -f clean.mk PORTS="$(PORTS)" realclean ;\
        done
-       for prj in $(PRJS); do\
-         $(MAKE) -C $$prj realclean ;\
-       done
 
 
 # Creating distribution