aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBlue Swirl <blauwirbel@gmail.com>2009-08-15 08:47:42 +0000
committerBlue Swirl <blauwirbel@gmail.com>2009-08-15 08:47:42 +0000
commit6af5a2524646ddc027114d80912cdd8ee0b7c7c8 (patch)
tree07f0a8a0ecbe5144beac32f8c92f9bf5138abc93
parent5ba6531956b9b6486560cbd13604c2238a3542dd (diff)
linux-user: compile envlist.c only once
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
-rw-r--r--Makefile2
-rw-r--r--Makefile.target2
-rw-r--r--envlist.c (renamed from linux-user/envlist.c)0
-rw-r--r--envlist.h (renamed from linux-user/envlist.h)0
4 files changed, 2 insertions, 2 deletions
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
index e13c2d3e14..e13c2d3e14 100644
--- a/linux-user/envlist.c
+++ b/envlist.c
diff --git a/linux-user/envlist.h b/envlist.h
index e76d4a101b..e76d4a101b 100644
--- a/linux-user/envlist.h
+++ b/envlist.h