From 6af5a2524646ddc027114d80912cdd8ee0b7c7c8 Mon Sep 17 00:00:00 2001
From: Blue Swirl <blauwirbel@gmail.com>
Date: Sat, 15 Aug 2009 08:47:42 +0000
Subject: [PATCH] linux-user: compile envlist.c only once

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
---
 Makefile                          | 2 +-
 Makefile.target                   | 2 +-
 linux-user/envlist.c => envlist.c | 0
 linux-user/envlist.h => envlist.h | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename linux-user/envlist.c => envlist.c (100%)
 rename linux-user/envlist.h => envlist.h (100%)

diff --git a/Makefile b/Makefile
index 343798988b..912284a708 100644
--- a/Makefile
+++ b/Makefile
@@ -162,7 +162,7 @@ libqemu_common.a: $(obj-y)
 
 #######################################################################
 # user-obj-y is code used by qemu userspace emulation
-user-obj-y = cutils.o cache-utils.o path.o
+user-obj-y = cutils.o cache-utils.o path.o envlist.o
 
 libqemu_user.a: $(user-obj-y)
 
diff --git a/Makefile.target b/Makefile.target
index 74f869db48..1e91cf2d8f 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -87,7 +87,7 @@ VPATH+=:$(SRC_PATH)/linux-user:$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
 QEMU_CFLAGS+=-I$(SRC_PATH)/linux-user -I$(SRC_PATH)/linux-user/$(TARGET_ABI_DIR)
 
 obj-y = main.o syscall.o strace.o mmap.o signal.o thunk.o \
-      elfload.o linuxload.o uaccess.o envlist.o gdbstub.o gdbstub-xml.o
+      elfload.o linuxload.o uaccess.o gdbstub.o gdbstub-xml.o
 
 obj-$(TARGET_HAS_BFLT) += flatload.o
 obj-$(TARGET_HAS_ELFLOAD32) += elfload32.o
diff --git a/linux-user/envlist.c b/envlist.c
similarity index 100%
rename from linux-user/envlist.c
rename to envlist.c
diff --git a/linux-user/envlist.h b/envlist.h
similarity index 100%
rename from linux-user/envlist.h
rename to envlist.h
-- 
2.30.2