[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/46] remove CONFIG_ from VNC_TLS_{LIBS, FLAGS}
From: |
Juan Quintela |
Subject: |
[Qemu-devel] [PATCH 04/46] remove CONFIG_ from VNC_TLS_{LIBS, FLAGS} |
Date: |
Fri, 24 Jul 2009 20:30:04 +0200 |
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
- [Qemu-devel] Re: [PATCH 45/46] Remove AUDIO_DRIVERS define, (continued)
- [Qemu-devel] Re: [PATCH 45/46] Remove AUDIO_DRIVERS define, Jan Kiszka, 2009/07/26
- [Qemu-devel] Re: [PATCH 45/46] Remove AUDIO_DRIVERS define, Avi Kivity, 2009/07/26
- [Qemu-devel] Re: [PATCH 45/46] Remove AUDIO_DRIVERS define, malc, 2009/07/26
- [Qemu-devel] Re: [PATCH 45/46] Remove AUDIO_DRIVERS define, Jan Kiszka, 2009/07/26
- [Qemu-devel] Re: [PATCH 45/46] Remove AUDIO_DRIVERS define, malc, 2009/07/26
- Re: [Qemu-devel] Re: [PATCH 45/46] Remove AUDIO_DRIVERS define, Anthony Liguori, 2009/07/26
- [Qemu-devel] Re: [PATCH 45/46] Remove AUDIO_DRIVERS define, Anthony Liguori, 2009/07/26
[Qemu-devel] [PATCH 21/46] rename HAVE_FNMATCH_H to CONFIG_FNMATCH, Juan Quintela, 2009/07/24
[Qemu-devel] [PATCH 02/46] Remove SP_CFLAGS and SP_LDFLAGS, Juan Quintela, 2009/07/24
[Qemu-devel] [PATCH 05/46] use same algorithm for testing and, Juan Quintela, 2009/07/24
[Qemu-devel] [PATCH 04/46] remove CONFIG_ from VNC_TLS_{LIBS, FLAGS},
Juan Quintela <=
[Qemu-devel] [PATCH 07/46] remove CONFIG_ from BLUEZ_{LIBS,FLAGS}, Juan Quintela, 2009/07/24
[Qemu-devel] [PATCH 01/46] change HOST_SOLARIS to CONFIG_SOLARIS{_VERSION}, Juan Quintela, 2009/07/24
[Qemu-devel] [PATCH 09/46] make oss use OSS_LIBS, Juan Quintela, 2009/07/24
[Qemu-devel] [PATCH 10/46] move printing of config-host.mak variables to end of generation, Juan Quintela, 2009/07/24
[Qemu-devel] [PATCH 06/46] remove CONFIG_ from VNC_SASL_{LIBS, FLAGS}, Juan Quintela, 2009/07/24
[Qemu-devel] [PATCH 08/46] make fmod also use FMOD_{LIBS,CFLAGS}, Juan Quintela, 2009/07/24
[Qemu-devel] [PATCH 15/46] fix indententation, Juan Quintela, 2009/07/24
[Qemu-devel] [PATCH 20/46] rename HAVE_IOVEC to CONFIG_IOVEC, Juan Quintela, 2009/07/24
[Qemu-devel] [PATCH 03/46] target_arch2 is redefined unconditionally later, Juan Quintela, 2009/07/24
[Qemu-devel] [PATCH 16/46] O_LARGEFILE is already set in qemu-common.h, Juan Quintela, 2009/07/24