[Qemu-devel] [PATCH 16/19] Refactor a single rule to generate all qemu-* executables

[quintela]

From: Juan Quintela <address@hidden>


Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile.target |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/Makefile.target b/Makefile.target
index 33f817d..6a701ae 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -299,9 +299,7 @@ obj-m68k-y += m68k-sim.o m68k-semi.o
 # cpu_signal_handler() in cpu-exec.c.
 signal.o: CFLAGS += $(HELPER_CFLAGS)

-$(QEMU_PROG): ARLIBS=../libqemu_user.a libqemu.a
-$(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y)  ../libqemu_user.a 
libqemu.a
-       $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
+ARLIBS=../libqemu_user.a libqemu.a

 ifeq ($(ARCH),alpha)
 # Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of
@@ -331,9 +329,7 @@ obj-y = main.o commpage.o machload.o mmap.o signal.o 
syscall.o thunk.o \
 # cpu_signal_handler() in cpu-exec.c.
 signal.o: CFLAGS += $(HELPER_CFLAGS)

-$(QEMU_PROG): ARLIBS=libqemu.a
-$(QEMU_PROG): $(obj-y) libqemu.a
-       $(call LINK,$(obj-y))
+ARLIBS=libqemu.a

 endif #CONFIG_DARWIN_USER

@@ -431,9 +427,7 @@ obj-y += uaccess.o
 # cpu_signal_handler() in cpu-exec.c.
 signal.o: CFLAGS += $(HELPER_CFLAGS)

-$(QEMU_PROG): ARLIBS=libqemu.a ../libqemu_user.a
-$(QEMU_PROG): $(obj-y) libqemu.a ../libqemu_user.a
-       $(call LINK,$(obj-y))
+ARLIBS=libqemu.a ../libqemu_user.a

 endif #CONFIG_BSD_USER

@@ -682,13 +676,15 @@ vl.o: qemu-options.h

 monitor.o: qemu-monitor.h

-$(QEMU_PROG): LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) 
$(VDE_LIBS) $(CURL_LIBS)
-$(QEMU_PROG): ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)
-$(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) ../libqemu_common.a 
libqemu.a $(HWLIB)
-       $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
+LIBS += $(SDL_LIBS) $(COCOA_LIBS) $(CURSES_LIBS) $(BRLAPI_LIBS) $(VDE_LIBS) 
$(CURL_LIBS)
+ARLIBS=../libqemu_common.a libqemu.a $(HWLIB)

 endif # !CONFIG_USER_ONLY

+$(QEMU_PROG): $(obj-y) $(obj-$(TARGET_BASE_ARCH)-y) $(ARLIBS)
+       $(call LINK,$(obj-y) $(obj-$(TARGET_BASE_ARCH)-y))
+
+
 gdbstub-xml.c: $(TARGET_XML_FILES) feature_to_c.sh
 ifeq ($(TARGET_XML_FILES),)
        $(call quiet-command,rm -f $@ && echo > $@,"  GEN   $(TARGET_DIR)$@")
-- 
1.6.2.2