From: michaelh <michaelh@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sun, 26 Mar 2000 07:47:50 +0000 (+0000)
Subject: Made it build better
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=229bba4eecf7df0f36ac070ddc3b69e84f385354;p=fw%2Fsdcc

Made it build better


git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@205 4a8a32a2-be11-0410-ad9d-d568d2c75423
---

diff --git a/as/Makefile b/as/Makefile
index e506337a..206729bc 100644
--- a/as/Makefile
+++ b/as/Makefile
@@ -1,18 +1,17 @@
 PRJDIR = ..
 include $(PRJDIR)/Makefile.common
 
-PORTS = _z80 _gbz80
+PORTS = z80 gbz80
 
-all: 
-	for i in $(PORTS); do make $$i; done
+all:
+	for i in $(PORTS); do make _as THIS=$$i; done
 
-_z80: clean
-	make -C z80
-	cp z80/as$(E) $(PRJDIR)/bin/as-z80$(E)
-
-_gbz80: clean
-	make -C z80 "OPTS=-DGAMEBOY"
-	cp z80/as$(E) $(PRJDIR)/bin/as-gbz80$(E)
+_as: clean
+ifeq ($(THIS), gbz80)
+	make -C z80 BUILDDIR=../../bin EXT=-$(THIS)$(E) OPTS=-DGAMEBOY
+else
+	make -C z80 BUILDDIR=../../bin EXT=-$(THIS)$(E)
+endif
 
 clean:
 	make -C z80 clean
diff --git a/as/z80/Makefile b/as/z80/Makefile
index b661827e..7f77efa5 100644
--- a/as/z80/Makefile
+++ b/as/z80/Makefile
@@ -5,7 +5,7 @@ include $(PRJDIR)/Makefile.common
 SDC	= .
 OBJS	= asdata.o asexpr.o aslex.o aslist.o asmain.o asout.o \
 	  assubr.o assym.o z80adr.o z80ext.o z80mch.o z80pst.o
-BINS	= as
+BINS	= $(BUILDDIR)/as$(EXT)
 
 CFLAGS	+= $(OPTS) -I. -DINDEXLIB -DMLH_MAP -DUNIX -DSDK
 CFLAGS	+= -funsigned-char
diff --git a/link/Makefile b/link/Makefile
index bbd1c19f..1e2b1fb4 100644
--- a/link/Makefile
+++ b/link/Makefile
@@ -2,18 +2,17 @@ PRJDIR = ..
 
 include $(PRJDIR)/Makefile.common
 
-PORTS = _z80 _gbz80
+PORTS = z80 gbz80
 
 all: 
-	for i in $(PORTS); do make $$i; done
+	for i in $(PORTS); do make _link THIS=$$i; done
 
-_z80: clean
-	make -C z80
-	cp z80/link$(E) $(PRJDIR)/bin/link-z80$(E)
-
-_gbz80: clean
-	make -C z80 "OPTS=-DGAMEBOY"
-	cp z80/link$(E) $(PRJDIR)/bin/link-gbz80$(E)
+_link: clean
+ifeq ($(THIS), gbz80)
+	make -C z80 BUILDDIR=../../bin EXT=-$(THIS) OPTS=-DGAMEBOY
+else
+	make -C z80 BUILDDIR=../../bin EXT=-$(THIS)
+endif
 
 clean:
 	make -C z80 clean
diff --git a/link/z80/Makefile b/link/z80/Makefile
index aee2263a..23763ebc 100644
--- a/link/z80/Makefile
+++ b/link/z80/Makefile
@@ -5,7 +5,7 @@ include $(PRJDIR)/Makefile.common
 OBJS	= lkarea.o lkdata.o lkeval.o lkhead.o lkihx.o lklex.o \
 	  lklibr.o lklist.o lkmain.o lkrloc.o lks19.o lksym.o \
 	  lkgb.o lkgg.o
-BINS	= link 
+BINS	= $(BUILDDIR)/link$(EXT)
 
 CFLAGS	+= $(OPTS) -DINDEXLIB -DMLH_MAP -DUNIX -DSDK -DSDK_VERSION_STRING="\"3.0.0\"" -DTARGET_STRING="\"gbz80\""
 CFLAGS	+= -funsigned-char -DUNIX
diff --git a/link/z80/lkmain.c b/link/z80/lkmain.c
index 1d59a2a7..4f029de0 100644
--- a/link/z80/lkmain.c
+++ b/link/z80/lkmain.c
@@ -18,6 +18,13 @@
 #include <alloc.h>
 #include "aslink.h"
 
+#ifndef SDK_VERSION_STRING
+#define SDK_VERSION_STRING 	"3.0.0"
+#endif
+#ifdef TARGET_STRING
+#define TARGET_STRING		"gbz80"
+#endif
+
 /*)Module	lkmain.c
  *
  *	The module lkmain.c contains the functions which