[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 28/38] buildsys: Move gtk/vte cflags/libs to per obje
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 28/38] buildsys: Move gtk/vte cflags/libs to per object |
Date: |
Fri, 8 Sep 2017 17:54:56 +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 | 3 +--
ui/Makefile.objs | 4 ++++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/configure b/configure
index 821922fffc..a007a4d430 100755
--- a/configure
+++ b/configure
@@ -2434,7 +2434,6 @@ if test "$gtk" != "no"; then
gtk_cflags="$gtk_cflags $x11_cflags"
gtk_libs="$gtk_libs $x11_libs"
fi
- libs_softmmu="$gtk_libs $libs_softmmu"
gtk="yes"
elif test "$gtk" = "yes"; then
feature_not_found "gtk" "Install gtk3-devel"
@@ -2684,7 +2683,6 @@ if test "$vte" != "no"; then
vte_cflags=$($pkg_config --cflags $vtepackage)
vte_libs=$($pkg_config --libs $vtepackage)
vteversion=$($pkg_config --modversion $vtepackage)
- libs_softmmu="$vte_libs $libs_softmmu"
vte="yes"
elif test "$vte" = "yes"; then
if test "$gtkabi" = "3.0"; then
@@ -5749,6 +5747,7 @@ fi
if test "$vte" = "yes" ; then
echo "CONFIG_VTE=y" >> $config_host_mak
echo "VTE_CFLAGS=$vte_cflags" >> $config_host_mak
+ echo "VTE_LIBS=$vte_libs" >> $config_host_mak
fi
if test "$virglrenderer" = "yes" ; then
echo "CONFIG_VIRGL=y" >> $config_host_mak
diff --git a/ui/Makefile.objs b/ui/Makefile.objs
index 3369451285..146a8ce062 100644
--- a/ui/Makefile.objs
+++ b/ui/Makefile.objs
@@ -45,6 +45,10 @@ gtk.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)
gtk-egl.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)
gtk-gl-area.o-cflags := $(GTK_CFLAGS) $(VTE_CFLAGS)
+gtk.o-libs := $(GTK_LIBS) $(VTE_LIBS)
+gtk-egl.o-libs := $(GTK_LIBS) $(VTE_LIBS)
+gtk-gl-area.o-libs := $(GTK_LIBS) $(VTE_LIBS)
+
gtk-egl.o-libs += $(OPENGL_LIBS)
shader.o-libs += $(OPENGL_LIBS)
console-gl.o-libs += $(OPENGL_LIBS)
--
2.13.5
- [Qemu-devel] [PULL 18/38] tests: Add README for vm tests, (continued)
- [Qemu-devel] [PULL 18/38] tests: Add README for vm tests, Fam Zheng, 2017/09/08
- [Qemu-devel] [PULL 19/38] docker: Use archive-source.py, Fam Zheng, 2017/09/08
- [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 <=
- [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, 2017/09/08
- [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