aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJuan Quintela <quintela@redhat.com>2009-08-03 14:46:15 +0200
committerAnthony Liguori <aliguori@us.ibm.com>2009-08-10 13:05:38 -0500
commitfa5e22cfc02dfed3d79e64e214b57f61ffafd8ea (patch)
tree5f3e0db2b1c03816b8c248df52d7140a0655fbbb
parent9b86c9531d0fa4bd6fb3a8764b9166c866565ed4 (diff)
We want to pass LIB through configuration files now
Signed-off-by: Juan Quintela <quintela@redhat.com> Signed-off-by: Anthony Liguori <aliguori@us.ibm.com> Message-Id:
-rw-r--r--Makefile2
-rw-r--r--Makefile.target1
-rwxr-xr-xconfigure1
3 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index ad8e9736eb..05cf0988e1 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ VPATH=$(SRC_PATH):$(SRC_PATH)/hw
CPPFLAGS += -I. -I$(SRC_PATH) -MMD -MP -MT $@
CPPFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
CPPFLAGS += -U_FORTIFY_SOURCE
-LIBS=-lz
+LIBS+=-lz
ifdef BUILD_DOCS
DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8
diff --git a/Makefile.target b/Makefile.target
index 856a9bde2f..c32367f7a3 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -5,7 +5,6 @@ TARGET_PATH=$(SRC_PATH)/target-$(TARGET_BASE_ARCH)
VPATH=$(SRC_PATH):$(TARGET_PATH):$(SRC_PATH)/hw
CPPFLAGS=-I. -I.. -I$(TARGET_PATH) -I$(SRC_PATH) -MMD -MT $@ -MP -DNEED_CPU_H
#CFLAGS+=-Werror
-LIBS=
ifdef CONFIG_USER_ONLY
# user emulator name
diff --git a/configure b/configure
index 20a2f6c6fc..249229363e 100755
--- a/configure
+++ b/configure
@@ -1748,6 +1748,7 @@ echo "CFLAGS=$CFLAGS" >> $config_host_mak
echo "LDFLAGS=$LDFLAGS" >> $config_host_mak
echo "ARLIBS_BEGIN=$arlibs_begin" >> $config_host_mak
echo "ARLIBS_END=$arlibs_end" >> $config_host_mak
+echo "LIBS=$LIBS" >> $config_host_mak
echo "EXESUF=$EXESUF" >> $config_host_mak
echo "PTHREADLIBS=$PTHREADLIBS" >> $config_host_mak
echo "CLOCKLIBS=$CLOCKLIBS" >> $config_host_mak