X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=Makefile.in;h=0cf60ef7e3484ab0b20775c19627d050dfde15fe;hb=8fd1c14372cacf51c58fcfb16b5e26943e384808;hp=380db7517c93e418ba40c1b94d71e26bdd3a260b;hpb=a8e264a929f170ce24db46655dfeb9de1b3eca1d;p=fw%2Fsdcc

diff --git a/Makefile.in b/Makefile.in
index 380db751..0cf60ef7 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -15,22 +15,22 @@ 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	= packihx
+SDCC_PACKIHX	= support/packihx
 SDCC_LIBRARIAN	= support/librarian
 
 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_ASLINK     += as/mcs51 as/link/mcs51
 SDCC_MISC	+= debugger/mcs51
 endif
 
 ifeq ($(OPT_DISABLE_Z80), 0)
-SDCC_ASLINK     += as link
+SDCC_ASLINK     += as as/link
 endif
 
 ifeq ($(OPT_DISABLE_UCSIM), 0)
@@ -56,7 +56,7 @@ 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
@@ -100,7 +100,7 @@ sdcc-device-lib: sdcc-cc sdcc-aslink
 
 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:
@@ -129,7 +129,7 @@ install-tini:
 	@for pkg in $(PKGS_TINI); do\
 	  $(MAKE) -C $$pkg install ;\
 	done
-	$(MAKE) -C device/lib installDS390
+	$(MAKE) -C device/lib install