[Qemu-devel] [PATCH 13/37] fold PTHREADLIBS and CLOCKLIBS on generic LIBS

[quintela]

From: Juan Quintela <address@hidden>


Signed-off-by: Juan Quintela <address@hidden>
---
 Makefile        |    3 ---
 Makefile.target |    3 ---
 configure       |    8 ++------
 3 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 5c8c453..17bf2f9 100644
--- a/Makefile
+++ b/Makefile
@@ -29,9 +29,6 @@ else
 DOCS=
 endif

-LIBS+=$(PTHREADLIBS)
-LIBS+=$(CLOCKLIBS)
-
 ifdef CONFIG_SOLARIS
 LIBS+=-lsocket -lnsl -lresolv
 endif
diff --git a/Makefile.target b/Makefile.target
index 8c07c57..5c0b54a 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -286,9 +286,6 @@ signal.o: CFLAGS += $(HELPER_CFLAGS)
 ARLIBS=../libqemu_user.a libqemu.a
 endif #CONFIG_LINUX_USER

-LIBS+= $(PTHREADLIBS)
-LIBS+= $(CLOCKLIBS)
-
 #########################################################
 # Darwin user emulator target

diff --git a/configure b/configure
index 80bb663..93470dc 100755
--- a/configure
+++ b/configure
@@ -1216,7 +1216,6 @@ fi
 ##########################################
 # pthread probe
 PTHREADLIBS_LIST="-lpthread -lpthreadGC2"
-PTHREADLIBS=""

 if test "$pthread" = yes; then
   pthread=no
@@ -1227,7 +1226,7 @@ EOF
   for pthread_lib in $PTHREADLIBS_LIST; do
     if $cc $ARCH_CFLAGS -o $TMPE $TMPC $pthread_lib 2> /dev/null > /dev/null ; 
then
       pthread=yes
-      PTHREADLIBS="$pthread_lib"
+      LIBS="$LIBS $pthread_lib"
       break
     fi
   done
@@ -1383,7 +1382,6 @@ fi

 ##########################################
 # Do we need librt
-CLOCKLIBS=""
 cat > $TMPC <<EOF
 #include <signal.h>
 #include <time.h>
@@ -1398,7 +1396,7 @@ elif $cc $ARCH_CFLAGS -o $TMPE $TMPC -lrt > /dev/null 2> 
/dev/null ; then
 fi

 if test "$rt" = "yes" ; then
-  CLOCKLIBS="-lrt"
+  LIBS="$LIBS -lrt"
 fi

 if test "$mingw32" = "yes" ; then
@@ -1846,8 +1844,6 @@ echo "LDFLAGS=$LDFLAGS $OS_LDFLAGS $ARCH_LDFLAGS 
$EXTRA_LDFLAGS" >> $config_host
 echo "CPPFLAGS=$CPPFLAGS" >> $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

 if test -f ${config_host_h}~ ; then
   if cmp -s $config_host_h ${config_host_h}~ ; then
-- 
1.6.2.5