From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43)
	id 1K1Olw-0005RE-Mr
	for qemu-devel@nongnu.org; Wed, 28 May 2008 12:45:08 -0400
Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43)
	id 1K1Olu-0005Po-BH
	for qemu-devel@nongnu.org; Wed, 28 May 2008 12:45:07 -0400
Received: from [199.232.76.173] (port=56197 helo=monty-python.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1K1Olu-0005Pf-2S
	for qemu-devel@nongnu.org; Wed, 28 May 2008 12:45:06 -0400
Received: from savannah.gnu.org ([199.232.41.3]:35844 helo=sv.gnu.org)
	by monty-python.gnu.org with esmtps (TLS-1.0:RSA_AES_256_CBC_SHA1:32)
	(Exim 4.60) (envelope-from <paul@nowt.org>) id 1K1Olt-0000O5-JF
	for qemu-devel@nongnu.org; Wed, 28 May 2008 12:45:05 -0400
Received: from cvs.savannah.gnu.org ([199.232.41.69])
	by sv.gnu.org with esmtp (Exim 4.63) (envelope-from <paul@nowt.org>)
	id 1K1Oln-0000u3-1u
	for qemu-devel@nongnu.org; Wed, 28 May 2008 16:44:59 +0000
Received: from pbrook by cvs.savannah.gnu.org with local (Exim 4.63)
	(envelope-from <pbrook@savannah.gnu.org>) id 1K1Olm-0000tr-HT
	for qemu-devel@nongnu.org; Wed, 28 May 2008 16:44:58 +0000
MIME-Version: 1.0
Errors-To: pbrook
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
From: Paul Brook <paul@nowt.org>
Message-Id: <E1K1Olm-0000tr-HT@cvs.savannah.gnu.org>
Date: Wed, 28 May 2008 16:44:58 +0000
Subject: [Qemu-devel] [4607] Don't link usermode emulation against
	libqemu_common.a
Reply-To: qemu-devel@nongnu.org
List-Id: qemu-devel.nongnu.org
List-Unsubscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/pipermail/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <http://lists.nongnu.org/mailman/listinfo/qemu-devel>,
	<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
To: qemu-devel@nongnu.org

Revision: 4607
          http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4607
Author:   pbrook
Date:     2008-05-28 16:44:57 +0000 (Wed, 28 May 2008)

Log Message:
-----------
Don't link usermode emulation against libqemu_common.a

Modified Paths:
--------------
    trunk/Makefile
    trunk/Makefile.target

Modified: trunk/Makefile
===================================================================
--- trunk/Makefile	2008-05-28 16:25:20 UTC (rev 4606)
+++ trunk/Makefile	2008-05-28 16:44:57 UTC (rev 4607)
@@ -26,11 +26,16 @@
 
 all: $(TOOLS) $(DOCS) recurse-all 
 
-subdir-%: dyngen$(EXESUF) libqemu_common.a
+SUBDIR_RULES=$(patsubst %,subdir-%, $(TARGET_DIRS))
+
+subdir-%: dyngen$(EXESUF)
 	$(MAKE) -C $(subst subdir-,,$@) all
 
-recurse-all: $(patsubst %,subdir-%, $(TARGET_DIRS))
+$(filter %-softmmu,$(SUBDIR_RULES)): libqemu_common.a
+$(filter %-user,$(SUBDIR_RULES)): libqemu_user.a
 
+recurse-all: $(SUBDIR_RULES)
+
 #######################################################################
 # BLOCK_OBJS is code used by both qemu system emulation and qemu-img
 
@@ -141,6 +146,14 @@
 	rm -f $@ 
 	$(AR) rcs $@ $(OBJS)
 
+#######################################################################
+# USER_OBJS is code used by qemu userspace emulation
+USER_OBJS=cutils.o
+
+libqemu_user.a: $(USER_OBJS)
+	rm -f $@ 
+	$(AR) rcs $@ $(USER_OBJS)
+
 QEMU_IMG_BLOCK_OBJS = $(BLOCK_OBJS)
 ifdef CONFIG_WIN32
 QEMU_IMG_BLOCK_OBJS += qemu-img-block-raw-win32.o

Modified: trunk/Makefile.target
===================================================================
--- trunk/Makefile.target	2008-05-28 16:25:20 UTC (rev 4606)
+++ trunk/Makefile.target	2008-05-28 16:44:57 UTC (rev 4607)
@@ -414,14 +414,13 @@
 endif
 
 OBJS+= libqemu.a
-OBJS+= ../libqemu_common.a
 
 # Note: this is a workaround. The real fix is to avoid compiling
 # cpu_signal_handler() in cpu-exec.c.
 signal.o: signal.c
 	$(CC) $(HELPER_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o $@ $<
 
-$(QEMU_PROG): $(OBJS)
+$(QEMU_PROG): $(OBJS) ../libqemu_user.a
 	$(CC) $(LDFLAGS) -o $@ $^  $(LIBS)
 ifeq ($(ARCH),alpha)
 # Mark as 32 bit binary, i. e. it will be mapped into the low 31 bit of