From 97dd1918492164bd75cbc770d9872ee75a726bab Mon Sep 17 00:00:00 2001
From: deuce <>
Date: Tue, 27 Feb 2007 03:44:27 +0000
Subject: [PATCH] Put the reroll objects in the object directory.
---
xtrn/tbd/GNUmakefile | 4 ++--
xtrn/tbd/Makefile | 2 +-
xtrn/tbd/objects.mk | 4 ++++
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/xtrn/tbd/GNUmakefile b/xtrn/tbd/GNUmakefile
index 89b8a4015d..a606d9dfa9 100644
--- a/xtrn/tbd/GNUmakefile
+++ b/xtrn/tbd/GNUmakefile
@@ -30,13 +30,13 @@ $(TBD): $(OBJS)
endif
$(QUIET)$(CC) $(MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(LDFLAGS) $^ -o $@ $(XPDEV-MT_LIBS)
-$(MAPMAKER): mapmaker.o
+$(MAPMAKER): $(MAPMAKER_OBJS)
ifndef bcc
@echo Linking $@
endif
$(QUIET)$(CC) $(MT_LDFLAGS) $(XPDEV-MT_LDFLAGS) $(LDFLAGS) $^ -o $@ $(XPDEV-MT_LIBS)
-$(REROLL): reroll.o
+$(REROLL): $(REROLL_OBJS)
ifndef bcc
@echo Linking $@
endif
diff --git a/xtrn/tbd/Makefile b/xtrn/tbd/Makefile
index 948bfad776..ba3a7a857f 100644
--- a/xtrn/tbd/Makefile
+++ b/xtrn/tbd/Makefile
@@ -24,7 +24,7 @@ $(TBD): $(OBJS)
@copy /y $(TBD) .
# Main EXE Link Rule
-$(REROLL): reroll.obj
+$(REROLL): $(REROLL_OBJS)
@echo Linking $@
@$(CC) $(CFLAGS) $(XPDEV-MT_LDFLAGS) -e$@ $** $(XPDEV-MT_LIBS)
@copy /y $(REROLL) .
diff --git a/xtrn/tbd/objects.mk b/xtrn/tbd/objects.mk
index 1a46294419..599e597e65 100644
--- a/xtrn/tbd/objects.mk
+++ b/xtrn/tbd/objects.mk
@@ -2,3 +2,7 @@ OBJS = $(MTOBJODIR)$(DIRSEP)tbd$(OFILE) \
$(MTOBJODIR)$(DIRSEP)tbd2$(OFILE) \
$(MTOBJODIR)$(DIRSEP)xsdk$(OFILE) \
$(MTOBJODIR)$(DIRSEP)xsdkvars$(OFILE)
+
+MAPMAKER_OBJS = $(MTOBJODIR)$(DIRSEP)mapmaker$(OFILE)
+
+REROLL_OBJS = $(MTOBJODIR)$(DIRSEP)reroll$(OFILE)
--
GitLab