From 68f3891d9f67f419f8d6b14b16ea34ab8b137588 Mon Sep 17 00:00:00 2001
From: michaelh <michaelh@4a8a32a2-be11-0410-ad9d-d568d2c75423>
Date: Sun, 30 Sep 2001 00:05:38 +0000
Subject: [PATCH] 	* Makefile (sdcc-libs): Added makebin to the list of
 standard targets.

	* support/regression/ports/z80/spec.mk: Updated to use env for sdcc bin dir for automatic regression.


git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@1324 4a8a32a2-be11-0410-ad9d-d568d2c75423
---
 ChangeLog                            |  6 ++++++
 Makefile                             |  4 ++--
 support/makebin/Makefile             | 16 +++++++++++-----
 support/regression/ports/z80/spec.mk |  6 +++---
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bcb9cd53..997214e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2001-09-29  Michael Hope  <michaelh@juju.net.nz>
+
+	* Makefile (sdcc-libs): Added makebin to the list of standard targets.
+
+	* support/regression/ports/z80/spec.mk: Updated to use env for sdcc bin dir for automatic regression.
+
 2001-09-25  Michael Hope  <michaelh@juju.net.nz>
 
 	* configure.in: Fixed up so that ucsim is only configured once.
diff --git a/Makefile b/Makefile
index 4f810993..ea0f12e4 100644
--- a/Makefile
+++ b/Makefile
@@ -9,11 +9,11 @@ PRJDIR		= .
 include $(PRJDIR)/Makefile.common
 
 SDCC_MISC	= debugger/mcs51 sim/ucsim
-SDCC_LIBS	= support/cpp support/cpp2
+SDCC_LIBS	= support/cpp support/cpp2 support/makebin
 SDCC_DOC        = doc
 
 # Parts that are not normally compiled but need to be cleaned
-SDCC_EXTRA      = support/regression support/makebin
+SDCC_EXTRA      = support/regression
 
 SDCC_ASLINK	= as/mcs51 as link
 SDCC_PACKIHX	= packihx
diff --git a/support/makebin/Makefile b/support/makebin/Makefile
index 481910c7..6de64600 100644
--- a/support/makebin/Makefile
+++ b/support/makebin/Makefile
@@ -1,10 +1,16 @@
-BIN = makebin
-OBJ = makebin.o
+PRJDIR = ../..
+
+SOURCES = makebin.c
+BIN = $(PRJDIR)/bin/makebin
+
+include $(PRJDIR)/Makefile.common
 
 all: $(BIN)
 
-clean:
-	rm -f $(BIN) $(OBJ) *~
+$(BIN): $(OBJ)
+	$(CC) -o $(BIN) $(OBJ)
 
 install: all
-	install --strip $(BIN) /usr/bin
\ No newline at end of file
+	$(INSTALL) $(BIN) `echo $(bindir)/makebin|sed '$(transform)'`
+
+include clean.mk
diff --git a/support/regression/ports/z80/spec.mk b/support/regression/ports/z80/spec.mk
index 469deda3..cfe9ea06 100644
--- a/support/regression/ports/z80/spec.mk
+++ b/support/regression/ports/z80/spec.mk
@@ -12,17 +12,17 @@ EXTRAS = fwk/lib/testfwk$(OBJEXT) ports/$(PORT)/support$(OBJEXT)
 
 # Rule to generate a Emulator .bin file from the .ihx linker output.
 %$(EXEEXT): %.ihx
-	../makebin/makebin -s 32768 < $< > $@  # Must be 32768 due to a bug in ConsoleZ80
+	$(SDCC_DIR)/bin/makebin -s 32768 < $< > $@
 
 # Rule to link into .ihx
 %.ihx: %.c $(EXTRAS)
 	$(SDCC) $(SDCCFLAGS) $< $(EXTRAS)
 
 %$(OBJEXT): %.asm
-	../../bin/as-z80 -plosgff $@ $<
+	$(SDCC_DIR)/bin/as-z80 -plosgff $@ $<
 
 %$(OBJEXT): %.s
-	../../bin/as-z80 -plosgff $@ $<
+	$(SDCC_DIR)/bin/as-z80 -plosgff $@ $<
 
 %$(OBJEXT): %.c
 	$(SDCC) $(SDCCFLAGS) -c $<
-- 
2.30.2