Martins sdcdb changes

[fw/sdcc] / Makefile

diff --git a/Makefile b/Makefile
index c1a785f92a5600a87068a1410f44f32e26a8dd09..4826af1040efde1ecc7c15bb7759bd781bada64b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -6,12 +6,14 @@ SHELL         = /bin/sh
 
 PRJDIR         = .
 
+include $(PRJDIR)/Makefile.common
+
 SDCC_MISC      = debugger/mcs51 sim/ucsim
-SDCC_LIBS      = support/cpp support/cpp2
+SDCC_LIBS      = support/cpp2 support/makebin
 SDCC_DOC        = doc
 
 # Parts that are not normally compiled but need to be cleaned
-SDCC_EXTRA      = support/regression support/makebin
+SDCC_EXTRA      = support/regression
 
 SDCC_ASLINK    = as/mcs51 as link
 SDCC_PACKIHX   = packihx
@@ -61,7 +63,7 @@ sdcc-misc:
 sdcc-packihx:
        $(MAKE) -C $(SDCC_PACKIHX)
 
-sdcc-device:
+sdcc-device: sdcc-cc sdcc-aslink
        $(MAKE) -C device/include
        $(MAKE) -C device/lib
 
@@ -115,7 +117,7 @@ clean:
        $(MAKE) -f clean.mk clean
        @echo "+ Cleaning packages in their directories..."
        for pkg in $(PKGS); do\
-         $(MAKE) PORTS="$(PORTS)" -C $$pkg -f clean.mk clean ;\
+         $(MAKE) PORTS="$(PORTS)" EXEEXT=$(EXEEXT) -C $$pkg -f clean.mk clean ;\
        done
 
 # Deleting all files created by configuring or building the program
@@ -125,7 +127,7 @@ distclean:
        $(MAKE) -f clean.mk distclean
        @echo "+ DistCleaning packages using clean.mk..."
        for pkg in $(PKGS); do\
-         $(MAKE) -C $$pkg PORTS="$(PORTS)" -f clean.mk distclean ;\
+         $(MAKE) -C $$pkg PORTS="$(PORTS)" EXEEXT=$(EXEEXT) -f clean.mk distclean ;\
        done
        for pkg in $(SDCC_EXTRA); do \
          $(MAKE) -C $$pkg clean; \
@@ -136,7 +138,7 @@ distclean:
 mostlyclean: clean
        $(MAKE) -f clean.mk mostlyclean
        for pkg in $(PKGS); do\
-         $(MAKE) -C $$pkg -f clean.mk PORTS="$(PORTS)" mostlyclean ;\
+         $(MAKE) -C $$pkg -f clean.mk PORTS="$(PORTS)" EXEEXT=$(EXEEXT) mostlyclean ;\
        done
 
 
@@ -146,7 +148,7 @@ mostlyclean: clean
 realclean: distclean
        $(MAKE) -f clean.mk realclean
        for pkg in $(PKGS); do\
-         $(MAKE) -C $$pkg -f clean.mk PORTS="$(PORTS)" realclean ;\
+         $(MAKE) -C $$pkg -f clean.mk PORTS="$(PORTS)" EXEEXT=$(EXEEXT) realclean ;\
        done