linux-user: compile envlist.c only once

Signed-off-by: Blue Swirl <blauwirbel@gmail.com>

diff --git a/Makefile b/Makefile
index 343798988b3ec9f31496b3c4517b1660a81ad226..912284a70858ff95085b7158192a1fd74eb98522 100644 (file)
--- 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 74f869db4880f1f812ef00ab59a799536cc7a3cd..1e91cf2d8f13a7f0c633c7c90d52c0624692768a 100644 (file)
--- 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