* 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

diff --git a/ChangeLog b/ChangeLog
index bcb9cd53e7b0edf7c96d60f198e2a951e2500b91..997214e756c912f6cef1633206d84ad6eae0d8eb 100644 (file)
--- 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 4f810993f98a59d02742b3004cd99501b9938b25..ea0f12e4622ec6937f98b9104b0544561e1e2937 100644 (file)
--- 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 481910c79302350c4b2464afbe5246047a8810c2..6de6460044c056c889e0152343a354c0376e0407 100644 (file)
--- 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 469deda36c4528d4b669f500627260768115327c..cfe9ea06c6204a361b73557fbf765dccaa82057a 100644 (file)
--- 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 $<