[Qemu-devel] [PATCH 07/20] fold VNC_TLS_CFLAGS into CPPCFLAGS

[quintela]

From: Juan Quintela <address@hidden>


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

diff --git a/Makefile b/Makefile
index bdbb87c..098f972 100644
--- a/Makefile
+++ b/Makefile
@@ -137,8 +137,6 @@ vnc.h: vnc-tls.h vnc-auth-vencrypt.h vnc-auth-sasl.h 
keymaps.h

 vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h acl.h

-vnc.o: CFLAGS += $(VNC_TLS_CFLAGS)
-
 vnc-tls.o: vnc-tls.c vnc.h

 vnc-auth-vencrypt.o: vnc-auth-vencrypt.c vnc.h
diff --git a/Makefile.target b/Makefile.target
index 8621c76..7c81a27 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -414,10 +414,6 @@ ifdef CONFIG_ADLIB
 adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0
 endif

-ifdef CONFIG_VNC_TLS
-CPPFLAGS += $(VNC_TLS_CFLAGS)
-endif
-
 ifdef CONFIG_VNC_SASL
 CPPFLAGS += $(VNC_SASL_CFLAGS)
 endif
diff --git a/configure b/configure
index 90bc793..bd4436d 100755
--- a/configure
+++ b/configure
@@ -967,9 +967,10 @@ EOF
     vnc_tls_libs=`pkg-config --libs gnutls 2> /dev/null`
     if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} $vnc_tls_cflags $TMPC \
            $vnc_tls_libs > /dev/null 2> /dev/null ; then
-       :
+        CPPFLAGS="$CPPFLAGS $vnc_tls_cflags"
+        LIBS="$LIBS $vnc_tls_libs"
     else
-       vnc_tls="no"
+        vnc_tls="no"
     fi
 fi

@@ -1654,9 +1655,7 @@ if test "$mixemu" = "yes" ; then
 fi
 if test "$vnc_tls" = "yes" ; then
   echo "CONFIG_VNC_TLS=y" >> $config_host_mak
-  echo "VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak
   echo "#define CONFIG_VNC_TLS 1" >> $config_host_h
- LIBS="$LIBS $vnc_tls_libs"
 fi
 if test "$vnc_sasl" = "yes" ; then
   echo "CONFIG_VNC_SASL=y" >> $config_host_mak
-- 
1.6.2.5