From 9fa7cda78c608ff64eadb69db5c004e09192bb0c Mon Sep 17 00:00:00 2001
From: Ian Jackson <iwj@mariner.uk.xensource.com>
Date: Wed, 12 Mar 2008 12:03:58 +0000
Subject: [PATCH] Better organisation of Makefile.target faff

---
 Makefile.target     | 5 ++++-
 xen-hooks.mak       | 4 ++++
 xen-make-target-dir | 8 ++------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 5ac29a7d82..1be2e36ee2 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -168,7 +168,7 @@ CFLAGS+=-I/opt/SUNWspro/prod/include/cc
 endif
 endif
 
-all: $(PROGS)
+default: all
 
 #########################################################
 # cpu emulator library
@@ -657,6 +657,9 @@ LDFLAGS+=-p
 main.o: CFLAGS+=-p
 endif
 
+include hooks.mak
+all: $(PROGS)
+
 $(QEMU_PROG): $(OBJS) ../libqemu_common.a libqemu.a
 	$(CC) $(LDFLAGS) -o $@ $^ $(LIBS) $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS)
 
diff --git a/xen-hooks.mak b/xen-hooks.mak
index a09b84c5ef..86a692d2e0 100644
--- a/xen-hooks.mak
+++ b/xen-hooks.mak
@@ -25,3 +25,7 @@ OBJS += xen_machine_pv.o
 OBJS += xenfb.o
 OBJS += xen_console.o
 OBJS += xen_machine_fv.o
+
+BAD_OBJS += monitor.o
+
+OBJS := $(filter-out $(BAD_OBJS), $(OBJS))
diff --git a/xen-make-target-dir b/xen-make-target-dir
index 08e6a0accb..3e17574ad4 100755
--- a/xen-make-target-dir
+++ b/xen-make-target-dir
@@ -4,9 +4,5 @@ if [ $# != 1 ]; then echo >&2 "usage: $0 <target-dir>"; exit 1; fi
 target=$1
 
 test -d $target || mkdir $target
-
-perl -pe '
-	BEGIN { print "# autogenerated - do not edit\n" or die $!; }
-	print "include hooks.mak\n" or die $!
-		if m/^all\s*\:/;
-' Makefile.target >$target/Makefile
+rm $target/Makefile
+ln -s ../Makefile.target $target/Makefile
-- 
2.39.5