[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/37] remove CONFIG_ from VNC_TLS_{LIBS, FLAGS}
From: |
quintela |
Subject: |
[Qemu-devel] [PATCH 04/37] remove CONFIG_ from VNC_TLS_{LIBS, FLAGS} |
Date: |
Fri, 17 Jul 2009 21:20:57 +0200 |
From: Juan Quintela <address@hidden>
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 5f7a9df..d76aae9 100755
--- a/configure
+++ b/configure
@@ -1646,8 +1646,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] [PATCH 00/37] Generate a proper LIBS variable, quintela, 2009/07/17
- [Qemu-devel] [PATCH 01/37] change HOST_SOLARIS to CONFIG_SOLARIS{_VERSION}, quintela, 2009/07/17
- [Qemu-devel] [PATCH 02/37] Remove SP_CFLAGS and SP_LDFLAGS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 03/37] target_arch2 is redefined unconditionally later, quintela, 2009/07/17
- [Qemu-devel] [PATCH 04/37] remove CONFIG_ from VNC_TLS_{LIBS, FLAGS},
quintela <=
- [Qemu-devel] [PATCH 05/37] use same algorithm for testing and, quintela, 2009/07/17
- [Qemu-devel] [PATCH 06/37] remove CONFIG_ from VNC_SASL_{LIBS, FLAGS}, quintela, 2009/07/17
- [Qemu-devel] [PATCH 09/37] make oss use OSS_LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 07/37] remove CONFIG_ from BLUEZ_{LIBS,FLAGS}, quintela, 2009/07/17
- [Qemu-devel] [PATCH 08/37] make fmod also use FMOD_{LIBS,CFLAGS}, quintela, 2009/07/17
- [Qemu-devel] [PATCH 10/37] move printing of config-host.mak variables to end of generation, quintela, 2009/07/17
- [Qemu-devel] [PATCH 11/37] more specific config.mak can overwrote more general config.mak, quintela, 2009/07/17
- [Qemu-devel] [PATCH 14/37] CONFIG_SOLARIS always want -lsockt -lnsl -lresolv, quintela, 2009/07/17
- [Qemu-devel] [PATCH 13/37] fold PTHREADLIBS and CLOCKLIBS on generic LIBS, quintela, 2009/07/17
- [Qemu-devel] [PATCH 12/37] generate CPPFLAGS and LIBS on ./configure, quintela, 2009/07/17