X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile;h=ed3dc083ac81bcc38622907ea97bce7bd3ad28cb;hb=3e16236a4e96ed06716248ae066e69075ac8d502;hp=05599e9bda359e3450119907d10b26878d6eff2b;hpb=54dac9ba2254fc8378d07290f176f90a60746c42;p=fw%2Fsdcc

diff --git a/Makefile b/Makefile
index 05599e9b..ed3dc083 100644
--- a/Makefile
+++ b/Makefile
@@ -3,20 +3,44 @@
 #
 
 SHELL		= /bin/sh
-AUTOCONF	= autoconf
 
 PRJDIR		= .
-SDCC_MISC	= debugger/mcs51 sim/ucsim binutils-2.9.5.0.13
-SDCC_LIBS	= support/cpp
+
+include $(PRJDIR)/Makefile.common
+
+SDCC_MISC	= debugger/mcs51 sim/ucsim
+SDCC_LIBS	= support/cpp2 support/makebin
+SDCC_DOC        = doc
+
+# Parts that are not normally compiled but need to be cleaned
+SDCC_EXTRA      = support/regression
+
 SDCC_ASLINK	= as/mcs51 as link
+SDCC_PACKIHX	= packihx
 
-PKGS		= $(SDCC_MISC) $(SDCC_LIBS) $(SDCC_ASLINK) \
-		  src device/include device/lib
-PKGS_TINI	= $(SDCC_LIBS) $(SDCC_ASLINK) \
-		  src device/include
-PORTS		= mcs51 z80
+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
 
-srcdir          = .
+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)
+ALLPORTS	= $(shell cat ports.all)
 
 # Compiling entire program or any subproject
 # ------------------------------------------
@@ -25,11 +49,6 @@ all: checkconf sdcc
 tini: checkconf sdcc-tini
 
 sdcc-libs:
-ifeq ($(CROSS_LIBGC),1)
-	$(MAKE) -C support/gc -f Makefile.cross
-else
-	$(MAKE) -C support/gc
-endif
 	for lib in $(SDCC_LIBS); do $(MAKE) -C $$lib; done
 
 sdcc-cc: sdcc-libs
@@ -41,6 +60,9 @@ sdcc-aslink:
 sdcc-misc:
 	for misc in $(SDCC_MISC); do $(MAKE) -C $$misc; done
 
+sdcc-packihx:
+	$(MAKE) -C $(SDCC_PACKIHX)
+
 sdcc-device:
 	$(MAKE) -C device/include
 	$(MAKE) -C device/lib
@@ -49,10 +71,12 @@ sdcc-device-tini:
 	$(MAKE) -C device/include
 	$(MAKE) -C device/lib modelDS390
 
-sdcc: sdcc-cc sdcc-aslink sdcc-misc sdcc-device
-	$(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-tini: sdcc-cc sdcc-aslink sdcc-device-tini sdcc-packihx
 	$(MAKE) -f main.mk all
 
 # Some interesting sub rules
@@ -93,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:
@@ -104,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
 # -----------------------------------------