1*4882a593SmuzhiyunFrom 47f175618a0b0817714ea557c9e93f22f327421e Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Hongxu Jia <hongxu.jia@windriver.com> 3*4882a593SmuzhiyunDate: Tue, 31 Jul 2018 16:39:52 +0800 4*4882a593SmuzhiyunSubject: [PATCH 1/4] tigervnc: remove includedir 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunUpstream-Status: Pending 7*4882a593Smuzhiyun 8*4882a593SmuzhiyunSigned-off-by: Chong Lu <Chong.Lu@windriver.com> 9*4882a593Smuzhiyun 10*4882a593SmuzhiyunIt fixes host contamination 11*4882a593Smuzhiyun 12*4882a593SmuzhiyunSigned-off-by: Hongxu Jia <hongxu.jia@windriver.com> 13*4882a593Smuzhiyun--- 14*4882a593Smuzhiyun unix/xserver/hw/vnc/Makefile.am | 6 +++--- 15*4882a593Smuzhiyun 1 file changed, 3 insertions(+), 3 deletions(-) 16*4882a593Smuzhiyun 17*4882a593Smuzhiyundiff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am 18*4882a593Smuzhiyunindex 470424b..ee18bf9 100644 19*4882a593Smuzhiyun--- a/unix/xserver/hw/vnc/Makefile.am 20*4882a593Smuzhiyun+++ b/unix/xserver/hw/vnc/Makefile.am 21*4882a593Smuzhiyun@@ -23,7 +23,7 @@ libvnccommon_la_SOURCES = $(HDRS) \ 22*4882a593Smuzhiyun 23*4882a593Smuzhiyun libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" -I$(TIGERVNC_SRCDIR)/unix/common \ 24*4882a593Smuzhiyun -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \ 25*4882a593Smuzhiyun- -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} -I$(includedir) \ 26*4882a593Smuzhiyun+ -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} \ 27*4882a593Smuzhiyun -I$(top_srcdir)/include 28*4882a593Smuzhiyun 29*4882a593Smuzhiyun bin_PROGRAMS = Xvnc 30*4882a593Smuzhiyun@@ -43,7 +43,7 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGERVNC -DNO_MODULE_EXTS \ 31*4882a593Smuzhiyun -UHAVE_CONFIG_H \ 32*4882a593Smuzhiyun -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ 33*4882a593Smuzhiyun -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -I$(TIGERVNC_SRCDIR)/unix/common \ 34*4882a593Smuzhiyun- -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) 35*4882a593Smuzhiyun+ -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} 36*4882a593Smuzhiyun 37*4882a593Smuzhiyun Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ 38*4882a593Smuzhiyun $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11 39*4882a593Smuzhiyun@@ -64,7 +64,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_ 40*4882a593Smuzhiyun -I$(top_srcdir)/hw/xfree86/os-support \ 41*4882a593Smuzhiyun -I$(top_srcdir)/hw/xfree86/os-support/bus \ 42*4882a593Smuzhiyun -I$(top_srcdir)/include \ 43*4882a593Smuzhiyun- ${XSERVERLIBS_CFLAGS} -I$(includedir) 44*4882a593Smuzhiyun+ ${XSERVERLIBS_CFLAGS} 45*4882a593Smuzhiyun 46*4882a593Smuzhiyun libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now 47*4882a593Smuzhiyun 48*4882a593Smuzhiyun-- 49*4882a593Smuzhiyun2.7.4 50*4882a593Smuzhiyun 51