Removed extra reference to packihx

[fw/sdcc] / Makefile

diff --git a/Makefile b/Makefile
index 9efd710eedec70eb821df8f0f8949d4b0611ddbc..003dd0c6a561f67c57b154f383449c9dc4e443ff 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@
 #
 #
 
+CFLAGS+=-g
 
 SHELL          = /bin/sh
 AUTOCONF       = autoconf
@@ -11,16 +12,35 @@ srcdir          = .
 include $(srcdir)/Makefile.common
 
 SDCC_MISC      = debugger/mcs51 sim/ucsim
-SDCC_LIBS      = support/cpp
+
+SDCC_LIBS      = support/cpp support/cpp2
+
 SDCC_ASLINK    = as/mcs51 as link
 SDCC_PACKIHX   = packihx
 
-PKGS           = $(SDCC_MISC) $(SDCC_LIBS) $(SDCC_ASLINK) \
-                 src device/include device/lib $(SDCC_PACKIHX)
+TARGETS         = sdcc-libs sdcc-cc sdcc-aslink
+
+PKGS           = $(SDCC_LIBS) src $(SDCC_ASLINK)
+
+ifneq ($(OPT_ENABLE_UCSIM), no)
+TARGETS         += sdcc-misc 
+PKGS            += $(SDCC_MISC)
+endif
+
+ifneq ($(OPT_ENABLE_DEVICE_LIB_BUILD), no)
+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          = mcs51 z80
-
+PORTS          = $(shell cat ports.build)
+ALLPORTS       = $(shell cat ports.all)
 
 # Compiling entire program or any subproject
 # ------------------------------------------
@@ -51,8 +71,7 @@ sdcc-device-tini:
        $(MAKE) -C device/include
        $(MAKE) -C device/lib modelDS390
 
-sdcc: sdcc-cc sdcc-aslink sdcc-misc sdcc-device sdcc-packihx
-       $(MAKE) -f main.mk all
+sdcc: $(TARGETS)
 
 sdcc-tini: sdcc-cc sdcc-aslink sdcc-device-tini sdcc-packihx
        $(MAKE) -f main.mk all