Merged 230 back into the main tree

[fw/sdcc] / Makefile

diff --git a/Makefile b/Makefile
index 0ea15900d095427dc72c51abc524dddcb69db89d..4f810993f98a59d02742b3004cd99501b9938b25 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,25 +2,25 @@
 #
 #
 
-CFLAGS+=-g
-
 SHELL          = /bin/sh
-AUTOCONF       = autoconf
 
 PRJDIR         = .
-srcdir          = .
-include $(srcdir)/Makefile.common
 
-SDCC_MISC      = debugger/mcs51 sim/ucsim
+include $(PRJDIR)/Makefile.common
 
+SDCC_MISC      = debugger/mcs51 sim/ucsim
 SDCC_LIBS      = support/cpp support/cpp2
+SDCC_DOC        = doc
+
+# Parts that are not normally compiled but need to be cleaned
+SDCC_EXTRA      = support/regression support/makebin
 
 SDCC_ASLINK    = as/mcs51 as link
 SDCC_PACKIHX   = packihx
 
-TARGETS         = sdcc-libs sdcc-cc sdcc-aslink sdcc-packihx
+TARGETS         = sdcc-libs sdcc-cc sdcc-aslink sdcc-doc
 
-PKGS           = $(SDCC_LIBS) src $(SDCC_ASLINK) $(SDCC_PACKIHX)
+PKGS           = $(SDCC_LIBS) src $(SDCC_ASLINK) $(SDCC_DOC)
 
 ifneq ($(OPT_ENABLE_UCSIM), no)
 TARGETS         += sdcc-misc 
@@ -32,6 +32,11 @@ TARGETS         += sdcc-device
 PKGS            += device/include device/lib
 endif
 
+ifneq ($(OPT_ENABLE_PACKIHX), no)
+TARGETS         += sdcc-packihx
+PKGS            += $(SDCC_PACKIHX)
+endif
+
 PKGS_TINI      = $(SDCC_LIBS) $(SDCC_ASLINK) \
                  src device/include $(SDCC_PACKIHX)
 PORTS          = $(shell cat ports.build)
@@ -66,8 +71,10 @@ sdcc-device-tini:
        $(MAKE) -C device/include
        $(MAKE) -C device/lib modelDS390
 
+# Empty for now, as doc depends on latex and latex2html
+sdcc-doc:
+
 sdcc: $(TARGETS)
-       echo $(TARGETS)
 
 sdcc-tini: sdcc-cc sdcc-aslink sdcc-device-tini sdcc-packihx
        $(MAKE) -f main.mk all
@@ -110,10 +117,9 @@ clean:
        $(MAKE) -f clean.mk clean
        @echo "+ Cleaning packages in their directories..."
        for pkg in $(PKGS); do\
-         $(MAKE) PORTS="$(PORTS)" -C $$pkg clean ;\
+         $(MAKE) PORTS="$(PORTS)" -C $$pkg -f clean.mk clean ;\
        done
 
-
 # Deleting all files created by configuring or building the program
 # -----------------------------------------------------------------
 distclean:
@@ -121,9 +127,11 @@ distclean:
        $(MAKE) -f clean.mk distclean
        @echo "+ DistCleaning packages using clean.mk..."
        for pkg in $(PKGS); do\
-         $(MAKE) -C $$pkg -f clean.mk PORTS="$(PORTS)" distclean ;\
+         $(MAKE) -C $$pkg PORTS="$(PORTS)" -f clean.mk distclean ;\
+       done
+       for pkg in $(SDCC_EXTRA); do \
+         $(MAKE) -C $$pkg clean; \
        done
-
 
 # Like clean but some files may still exist
 # -----------------------------------------