[Qemu-devel] [PATCH 04/46] remove CONFIG_ from VNC_TLS_{LIBS, FLAGS}

[Juan Quintela]

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

diff --git a/Makefile b/Makefile
index dc95869..a50e868 100644
--- a/Makefile
+++ b/Makefile
@@ -193,7 +193,7 @@ 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 += $(CONFIG_VNC_TLS_CFLAGS)
+vnc.o: CFLAGS += $(VNC_TLS_CFLAGS)

 vnc-tls.o: vnc-tls.c vnc.h

diff --git a/Makefile.target b/Makefile.target
index f9cd42a..0b2d885 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -456,8 +456,8 @@ adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0
 endif

 ifdef CONFIG_VNC_TLS
-CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS)
-LIBS += $(CONFIG_VNC_TLS_LIBS)
+CPPFLAGS += $(VNC_TLS_CFLAGS)
+LIBS += $(VNC_TLS_LIBS)
 endif

 ifdef CONFIG_VNC_SASL
diff --git a/configure b/configure
index 0145d53..736ccdd 100755
--- a/configure
+++ b/configure
@@ -1649,8 +1649,8 @@ if test "$mixemu" = "yes" ; then
 fi
 if test "$vnc_tls" = "yes" ; then
   echo "CONFIG_VNC_TLS=y" >> $config_host_mak
-  echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak
-  echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_host_mak
+  echo "VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak
+  echo "VNC_TLS_LIBS=$vnc_tls_libs" >> $config_host_mak
   echo "#define CONFIG_VNC_TLS 1" >> $config_host_h
 fi
 if test "$vnc_sasl" = "yes" ; then
-- 
1.6.2.5