gwj / at91sam9263 · Commits

Commit 525061bff2132a6833abfdeff8fd1d597addeece

Authored by Juan Quintela
Committed by Anthony Liguori
1 parent a6290cfd

remove CONFIG_ from VNC_TLS_{LIBS, FLAGS} 

Signed-off-by: Juan Quintela <quintela@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
Inline Side-by-side
Showing 3 changed files with 5 additions and 5 deletions
Makefile
  View file @525061b
@@ -193,7 +193,7 @@ vnc.h: vnc-tls.h vnc-auth-vencrypt.h vnc-auth-sasl.h keymaps.h @@ -193,7 +193,7 @@ vnc.h: vnc-tls.h vnc-auth-vencrypt.h vnc-auth-sasl.h keymaps.h
193 193
194 vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h acl.h 194 vnc.o: vnc.c vnc.h vnc_keysym.h vnchextile.h d3des.c d3des.h acl.h
195 195
196 -vnc.o: CFLAGS += $(CONFIG_VNC_TLS_CFLAGS) 196 +vnc.o: CFLAGS += $(VNC_TLS_CFLAGS)
197 197
198 vnc-tls.o: vnc-tls.c vnc.h 198 vnc-tls.o: vnc-tls.c vnc.h
199 199
Makefile.target
  View file @525061b
@@ -456,8 +456,8 @@ adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0 @@ -456,8 +456,8 @@ adlib.o fmopl.o: CFLAGS := ${CFLAGS} -DBUILD_Y8950=0
456 endif 456 endif
457 457
458 ifdef CONFIG_VNC_TLS 458 ifdef CONFIG_VNC_TLS
459 -CPPFLAGS += $(CONFIG_VNC_TLS_CFLAGS)  
460 -LIBS += $(CONFIG_VNC_TLS_LIBS) 459 +CPPFLAGS += $(VNC_TLS_CFLAGS)
  460 +LIBS += $(VNC_TLS_LIBS)
461 endif 461 endif
462 462
463 ifdef CONFIG_VNC_SASL 463 ifdef CONFIG_VNC_SASL
configure
  View file @525061b
@@ -1649,8 +1649,8 @@ if test &quot;$mixemu&quot; = &quot;yes&quot; ; then @@ -1649,8 +1649,8 @@ if test &quot;$mixemu&quot; = &quot;yes&quot; ; then
1649 fi 1649 fi
1650 if test "$vnc_tls" = "yes" ; then 1650 if test "$vnc_tls" = "yes" ; then
1651 echo "CONFIG_VNC_TLS=y" >> $config_host_mak 1651 echo "CONFIG_VNC_TLS=y" >> $config_host_mak
1652 - echo "CONFIG_VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak  
1653 - echo "CONFIG_VNC_TLS_LIBS=$vnc_tls_libs" >> $config_host_mak 1652 + echo "VNC_TLS_CFLAGS=$vnc_tls_cflags" >> $config_host_mak
  1653 + echo "VNC_TLS_LIBS=$vnc_tls_libs" >> $config_host_mak
1654 echo "#define CONFIG_VNC_TLS 1" >> $config_host_h 1654 echo "#define CONFIG_VNC_TLS 1" >> $config_host_h
1655 fi 1655 fi
1656 if test "$vnc_sasl" = "yes" ; then 1656 if test "$vnc_sasl" = "yes" ; then