X-Git-Url: https://git.gag.com/?p=fw%2Fsdcc;a=blobdiff_plain;f=Makefile.in;h=9887954758373ad7b95fa5abc16461285c32cd8a;hp=fd9410ad3d75da386b22c607b150f9b7ed41630d;hb=02176627f89b59425b3875521afb7dc87b6f745d;hpb=0a174b5c835e5487aaa0db4c54e7db84ea1a2e9f

diff --git a/Makefile.in b/Makefile.in
index fd9410ad..98879547 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2,7 +2,7 @@
 #
 #
 
-SHELL		= /bin/sh
+SHELL           = /bin/sh
 
 VPATH           = @srcdir@
 srcdir          = @srcdir@
@@ -11,22 +11,25 @@ top_srcdir      = @top_srcdir@
 
 include Makefile.common
 
-SDCC_LIBS	= support/makebin
+SDCC_LIBS       = support/makebin
 SDCC_DOC        = doc
 
 # Parts that are not normally compiled but need to be cleaned
-SDCC_EXTRA      = support/regression
+SDCC_EXTRA      = support/regression support/valdiag
 
-SDCC_PACKIHX	= support/packihx
-SDCC_LIBRARIAN	= support/librarian
+SDCC_PACKIHX    = support/packihx
+SDCC_LIBRARIAN  = support/librarian
+SDCC_ASRANLIB   = as/asranlib
+
+TARGETS         = sdcc-librarian sdcc-asranlib
 
 ifeq ($(OPT_DISABLE_HC08), 0)
-SDCC_ASLINK     += as/hc08
+SDCC_ASLINK     += as/hc08 as/link/hc08
 endif
 
 ifeq ($(OPT_DISABLE_MCS51), 0)
-SDCC_ASLINK     += as/mcs51
-SDCC_MISC	+= debugger/mcs51
+SDCC_ASLINK     += as/mcs51 as/link/mcs51
+SDCC_MISC       += debugger/mcs51
 endif
 
 ifeq ($(OPT_DISABLE_Z80), 0)
@@ -56,17 +59,17 @@ endif
 PKGS            += $(SDCC_DOC)
 
 ifeq ($(OPT_DISABLE_SDCPP), 0)
-SDCC_LIBS       += support/cpp2
+SDCC_LIBS       += support/cpp
 endif
 
-TARGETS         += sdcc-libs sdcc-cc sdcc-device-inc sdcc-aslink sdcc-librarian
+TARGETS         += sdcc-libs sdcc-cc sdcc-device-inc sdcc-aslink
 
-PKGS		+= $(SDCC_LIBS) src device/include $(SDCC_ASLINK) $(SDCC_LIBRARIAN)
+PKGS            += $(SDCC_LIBS) src device/include $(SDCC_ASLINK) $(SDCC_LIBRARIAN) $(SDCC_ASRANLIB)
 
-PKGS_TINI	= $(SDCC_LIBS) $(SDCC_ASLINK) \
-		  src device/include $(SDCC_PACKIHX) $(SDCC_LIBRARIAN)
-PORTS		= $(shell cat ports.build)
-ALLPORTS	= $(shell cat ports.all)
+PKGS_TINI       = $(SDCC_LIBS) $(SDCC_ASLINK) \
+                  src device/include $(SDCC_PACKIHX) $(SDCC_LIBRARIAN)
+PORTS           = $(shell cat ports.build)
+ALLPORTS        = $(shell cat ports.all)
 
 # Compiling entire program or any subproject
 # ------------------------------------------
@@ -92,15 +95,18 @@ sdcc-packihx:
 sdcc-librarian:
 	$(MAKE) -C $(SDCC_LIBRARIAN)
 
+sdcc-asranlib:
+	$(MAKE) -C $(SDCC_ASRANLIB)
+
 sdcc-device-inc:
 	$(MAKE) -C device/include
 
 sdcc-device-lib: sdcc-cc sdcc-aslink
-	$(MAKE) -C device/lib
+	$(MAKE) -C device/lib LIB_TYPE=LIB
 
 sdcc-device-tini:
 	$(MAKE) -C device/include
-	$(MAKE) -C device/lib modelDS390
+	$(MAKE) -C device/lib model-ds390 model-ds400
 
 # doc depends on latex and latex2html
 sdcc-doc:
@@ -108,7 +114,7 @@ sdcc-doc:
 
 sdcc: $(TARGETS)
 
-sdcc-tini: sdcc-cc sdcc-aslink sdcc-device-tini sdcc-packihx sdcc-librarian
+sdcc-tini: sdcc-librarian sdcc-asranlib sdcc-cc sdcc-aslink sdcc-device-tini sdcc-packihx
 	$(MAKE) -f main.mk all
 
 # Some interesting sub rules
@@ -129,7 +135,7 @@ install-tini:
 	@for pkg in $(PKGS_TINI); do\
 	  $(MAKE) -C $$pkg install ;\
 	done
-	$(MAKE) -C device/lib installDS390
+	$(MAKE) -C device/lib install