Commit ca273d58 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Blue Swirl
Browse files

build: fix includes for VNC 



vnc-tls.h is included by vnc.h, and it includes gnutls/gnutls.h.
Hence, GnuTLS header files are needed by all files that include
vnc.h, most notably qmp.c.  Move these flags to QEMU_CFLAGS for
simplicity.

Reported-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Signed-off-by: default avatarBlue Swirl <blauwirbel@gmail.com>
parent bb5801f5

Makefile.target

+0 −5
Original line number Diff line number Diff line
@@ -120,11 +120,6 @@ obj-$(CONFIG_NO_GET_MEMORY_MAPPING) += memory_mapping-stub.o 
obj-$(CONFIG_NO_CORE_DUMP) += dump-stub.o

LIBS+=-lz



QEMU_CFLAGS += $(VNC_TLS_CFLAGS)

QEMU_CFLAGS += $(VNC_SASL_CFLAGS)

QEMU_CFLAGS += $(VNC_JPEG_CFLAGS)

QEMU_CFLAGS += $(VNC_PNG_CFLAGS)



# xen support

obj-$(CONFIG_XEN) += xen-all.o xen-mapcache.o

obj-$(CONFIG_NO_XEN) += xen-stub.o

configure

+3 −4
Original line number Diff line number Diff line
@@ -1712,6 +1712,7 @@ EOF 
  if compile_prog "$vnc_tls_cflags" "$vnc_tls_libs" ; then

    vnc_tls=yes

    libs_softmmu="$vnc_tls_libs $libs_softmmu"

    QEMU_CFLAGS="$QEMU_CFLAGS $vnc_tls_cflags"

  else

    if test "$vnc_tls" = "yes" ; then

      feature_not_found "vnc-tls"
@@ -1734,6 +1735,7 @@ EOF 
  if compile_prog "$vnc_sasl_cflags" "$vnc_sasl_libs" ; then

    vnc_sasl=yes

    libs_softmmu="$vnc_sasl_libs $libs_softmmu"

    QEMU_CFLAGS="$QEMU_CFLAGS $vnc_sasl_cflags"

  else

    if test "$vnc_sasl" = "yes" ; then

      feature_not_found "vnc-sasl"
@@ -1755,6 +1757,7 @@ EOF 
  if compile_prog "$vnc_jpeg_cflags" "$vnc_jpeg_libs" ; then

    vnc_jpeg=yes

    libs_softmmu="$vnc_jpeg_libs $libs_softmmu"

    QEMU_CFLAGS="$QEMU_CFLAGS $vnc_jpeg_cflags"

  else

    if test "$vnc_jpeg" = "yes" ; then

      feature_not_found "vnc-jpeg"
@@ -3377,19 +3380,15 @@ if test "$vnc" = "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

fi

if test "$vnc_sasl" = "yes" ; then

  echo "CONFIG_VNC_SASL=y" >> $config_host_mak

  echo "VNC_SASL_CFLAGS=$vnc_sasl_cflags" >> $config_host_mak

fi

if test "$vnc_jpeg" = "yes" ; then

  echo "CONFIG_VNC_JPEG=y" >> $config_host_mak

  echo "VNC_JPEG_CFLAGS=$vnc_jpeg_cflags" >> $config_host_mak

fi

if test "$vnc_png" = "yes" ; then

  echo "CONFIG_VNC_PNG=y" >> $config_host_mak

  echo "VNC_PNG_CFLAGS=$vnc_png_cflags" >> $config_host_mak

fi

if test "$fnmatch" = "yes" ; then

  echo "CONFIG_FNMATCH=y" >> $config_host_mak

ui/Makefile.objs

+0 −1
Original line number Diff line number Diff line
@@ -14,6 +14,5 @@ common-obj-$(CONFIG_CURSES) += curses.o 
common-obj-$(CONFIG_VNC) += $(vnc-obj-y)



$(obj)/sdl.o $(obj)/sdl_zoom.o: QEMU_CFLAGS += $(SDL_CFLAGS) 

$(obj)/vnc.o: QEMU_CFLAGS += $(VNC_TLS_CFLAGS)



$(obj)/cocoa.o: $(SRC_PATH)/$(obj)/cocoa.m