X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile;h=ed3dc083ac81bcc38622907ea97bce7bd3ad28cb;hb=3e16236a4e96ed06716248ae066e69075ac8d502;hp=0b34350ae74a1adb9d06ec4a47f728b019a4326f;hpb=646879b54a5b6a5388fdee6e8091d20e564c2568;p=fw%2Fsdcc

diff --git a/Makefile b/Makefile
index 0b34350a..ed3dc083 100644
--- a/Makefile
+++ b/Makefile
@@ -3,28 +3,52 @@
 #
 
 SHELL		= /bin/sh
-AUTOCONF	= autoconf
 
 PRJDIR		= .
-PKGS		= debugger/mcs51 sim/ucsim
-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
 
-PRJS		= sim/ucsim
-PORTS		= mcs51 z80
+TARGETS         = sdcc-libs sdcc-cc sdcc-aslink sdcc-doc
 
-srcdir          = .
+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		= $(shell cat ports.build)
+ALLPORTS	= $(shell cat ports.all)
 
 # Compiling entire program or any subproject
 # ------------------------------------------
 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
@@ -34,19 +58,32 @@ sdcc-aslink:
 	for as in $(SDCC_ASLINK); do $(MAKE) -C $$as; done
 
 sdcc-misc:
-	for pkg in $(PKGS); do $(MAKE) -C $$pkg; done
-	$(MAKE) -C sim/ucsim
+	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
 
-sdcc: sdcc-cc sdcc-aslink sdcc-misc sdcc
+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)
+
+sdcc-tini: sdcc-cc sdcc-aslink sdcc-device-tini sdcc-packihx
 	$(MAKE) -f main.mk all
 
 # Some interesting sub rules
 sdcc-bin: sdcc-cc sdcc-aslink sdcc-misc
 
+sdcc-base: sdcc-cc sdcc-aslink
+
 # Compiling and installing everything and runing test
 # ---------------------------------------------------
 install:
@@ -55,6 +92,14 @@ install:
 	  $(MAKE) -C $$pkg install ;\
 	done
 
+install-tini:
+	$(MAKE) -f main.mk install
+	@for pkg in $(PKGS_TINI); do\
+	  $(MAKE) -C $$pkg install ;\
+	done
+	$(MAKE) -C device/lib installDS390
+
+
 
 # Deleting all the installed files
 # --------------------------------
@@ -72,13 +117,8 @@ 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
-	@echo "+ Cleaning sub-projects using Makefile..."
-	for prj in $(PRJS); do\
-	  $(MAKE) -C $$prj clean ;\
-	done
-
 
 # Deleting all files created by configuring or building the program
 # -----------------------------------------------------------------
@@ -87,14 +127,12 @@ 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
-	@echo "+ DistCleaning sub-projects using Makefile..."
-	for prj in $(PRJS); do\
-	  $(MAKE) -C $$prj distclean ;\
+	for pkg in $(SDCC_EXTRA); do \
+	  $(MAKE) -C $$pkg clean; \
 	done
 
-
 # Like clean but some files may still exist
 # -----------------------------------------
 mostlyclean: clean
@@ -102,9 +140,6 @@ mostlyclean: clean
 	for pkg in $(PKGS); do\
 	  $(MAKE) -C $$pkg -f clean.mk PORTS="$(PORTS)" mostlyclean ;\
 	done
-	for prj in $(PRJS); do\
-	  $(MAKE) -C $$prj mostlyclean ;\
-	done
 
 
 # Deleting everything that can reconstructed by this Makefile. It deletes
@@ -115,9 +150,6 @@ realclean: distclean
 	for pkg in $(PKGS); do\
 	  $(MAKE) -C $$pkg -f clean.mk PORTS="$(PORTS)" realclean ;\
 	done
-	for prj in $(PRJS); do\
-	  $(MAKE) -C $$prj realclean ;\
-	done
 
 
 # Creating distribution