X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile;h=5a02a6d936a53be4f1fa7b94d9d07682b158f3cd;hb=849c5ceff8223f5766996aa06749acccb87025e0;hp=029f78c6a815248f6040abe97f1420e209e892b9;hpb=0bbed99a81e05cf645dc464c4722a63ec070ccef;p=fw%2Fsdcc

diff --git a/Makefile b/Makefile
index 029f78c6..5a02a6d9 100644
--- a/Makefile
+++ b/Makefile
@@ -12,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_DOC        = doc
+
 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 sdcc-doc
+
+PKGS		= $(SDCC_LIBS) src $(SDCC_ASLINK) $(SDCC_DOC)
+
+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
 # ------------------------------------------
@@ -52,8 +71,10 @@ 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
+# Empty for now, as doc depends on latex and latex2html
+sdcc-doc:
+
+sdcc: $(TARGETS)
 
 sdcc-tini: sdcc-cc sdcc-aslink sdcc-device-tini sdcc-packihx
 	$(MAKE) -f main.mk all