[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 32/38] buildsys: Move curese cflags/libs to per objec
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 32/38] buildsys: Move curese cflags/libs to per object |
Date: |
Fri, 8 Sep 2017 17:55:00 +0800 |
Signed-off-by: Fam Zheng <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Gerd Hoffmann <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
configure | 6 ++++--
ui/Makefile.objs | 3 +++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index ddddfde599..df22b14259 100755
--- a/configure
+++ b/configure
@@ -3141,8 +3141,8 @@ EOF
unset IFS
if compile_prog "$curses_inc" "$curses_lib" ; then
curses_found=yes
- QEMU_CFLAGS="$curses_inc $QEMU_CFLAGS"
- libs_softmmu="$curses_lib $libs_softmmu"
+ curses_cflags="$curses_inc $curses_cflags"
+ curses_libs="$curses_lib $curses_libs"
break
fi
done
@@ -5611,6 +5611,8 @@ if test "$cocoa" = "yes" ; then
fi
if test "$curses" = "yes" ; then
echo "CONFIG_CURSES=y" >> $config_host_mak
+ echo "CURSES_CFLAGS=$curses_cflags" >> $config_host_mak
+ echo "CURSES_LIBS=$curses_libs" >> $config_host_mak
fi
if test "$pipe2" = "yes" ; then
echo "CONFIG_PIPE2=y" >> $config_host_mak
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index a0b3c15a28..e3403b698b 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -57,3 +57,6 @@ gtk-egl.o-libs += $(OPENGL_LIBS)
shader.o-libs += $(OPENGL_LIBS)
console-gl.o-libs += $(OPENGL_LIBS)
egl-helpers.o-libs += $(OPENGL_LIBS)
+
+curses.o-cflags := $(CURSES_CFLAGS)
+curses.o-libs := $(CURSES_LIBS)
--
2.13.5
- [Qemu-devel] [PULL 20/38] docker: Fix return code of build_qemu(), (continued)
- [Qemu-devel] [PULL 20/38] docker: Fix return code of build_qemu(), Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 21/38] docker: Add test_fail and prep_fail, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 22/38] docker: Use unconfined security profile, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 23/38] docker: Add nettle-devel to fedora image, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 24/38] docker: Add test-block, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 25/38] docker: Drop 'set -e' from run script, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 26/38] vl: Don't include vde header, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 27/38] buildsys: Move vde libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 28/38] buildsys: Move gtk/vte cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 29/38] buildsys: Move sdl cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 32/38] buildsys: Move curese cflags/libs to per object,
Fam Zheng <=
- [Qemu-devel] [PULL 30/38] buildsys: Move vnc cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 31/38] buildsys: Move audio libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 33/38] buildsys: Move opengl cflags to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 34/38] buildsys: Move libcacard cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 35/38] buildsys: Move libusb cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 37/38] buildsys: Move brlapi libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 36/38] buildsys: Move usb redir cflags/libs to per object, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 38/38] buildsys: Move rdma libs to per object, Fam Zheng, 2017/09/08
- Re: [Qemu-devel] [PULL 00/38] Test and build system patches, no-reply, 2017/09/08
- Re: [Qemu-devel] [PULL 00/38] Test and build system patches, Peter Maydell, 2017/09/08