CLOCKLIBS was used for all binaries

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Message-Id:

diff --git a/Makefile b/Makefile
index 2f74f25..75df24a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -27,8 +27,6 @@ else
 DOCS=
 endif
 
-LIBS+=$(CLOCKLIBS)
-
 ifdef CONFIG_SOLARIS
 LIBS+=-lsocket -lnsl -lresolv
 endif

diff --git a/Makefile.target b/Makefile.target
index 47343bb..090efb0 100644 (file)
--- a/Makefile.target
+++ b/Makefile.target
@@ -202,8 +202,6 @@ signal.o: CFLAGS += $(HELPER_CFLAGS)
 ARLIBS=../libqemu_user.a libqemu.a
 endif #CONFIG_LINUX_USER
 
-LIBS+= $(CLOCKLIBS)
-
 #########################################################
 # Darwin user emulator target
 

diff --git a/configure b/configure
index aadc1d2..0f76f08 100755 (executable)
--- a/configure
+++ b/configure
@@ -1340,9 +1340,9 @@ int main(void) { clockid_t id; return clock_gettime(id, NULL); }
 EOF
 
 if compile_prog "" "" ; then
-  CLOCKLIBS=""
+  :
 elif compile_prog "" "-lrt" ; then
-  CLOCKLIBS="-lrt"
+  LIBS="-lrt $LIBS"
 fi
 
 # Determine what linker flags to use to force archive inclusion
@@ -1749,7 +1749,6 @@ 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 "CLOCKLIBS=$CLOCKLIBS" >> $config_host_mak
 
 echo "/* Automatically generated by configure - do not modify */" > $config_host_h