summaryrefslogtreecommitdiffstats
path: root/unix/xserver
diff options
context:
space:
mode:
authorPeter Åstrand <astrand@cendio.se>2009-02-25 13:36:14 +0000
committerPeter Åstrand <astrand@cendio.se>2009-02-25 13:36:14 +0000
commit97270a7da37cacd48f3fc181877dcada701f8c36 (patch)
tree6df0ea577d163d7dbb98e90a4645c1ce39de43e1 /unix/xserver
parent60909b5718327bec485fc65da4c2342743d7a6b1 (diff)
downloadtigervnc-97270a7da37cacd48f3fc181877dcada701f8c36.tar.gz
tigervnc-97270a7da37cacd48f3fc181877dcada701f8c36.zip
Use include files from the includedir variable as well,
to support the use of the --includedir configure argument. git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@3617 3789f03b-4d11-0410-bbf8-ca57d06f2519
Diffstat (limited to 'unix/xserver')
-rw-r--r--unix/xserver/hw/vnc/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am
index 424f0b6b..957612ac 100644
--- a/unix/xserver/hw/vnc/Makefile.am
+++ b/unix/xserver/hw/vnc/Makefile.am
@@ -15,7 +15,7 @@ libvnccommon_la_SOURCES = $(HDRS) vncExtInit.cc vncHooks.cc XserverDesktop.cc
libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \
- -I$(BIN_DIR)/vncconfig $(XVNC_CPPFLAGS) -I$(includedir)/pixman-1
+ -I$(BIN_DIR)/vncconfig $(XVNC_CPPFLAGS) -I$(includedir)/pixman-1 -I$(includedir)
bin_PROGRAMS = Xvnc
@@ -30,7 +30,7 @@ nodist_Xvnc_SOURCES = fbrop.h fb.h pixman.h
Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DNO_HW_ONLY_EXTS -DNO_MODULE_EXTS \
-DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \
-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(LIB_DIR) \
- -I$(top_srcdir)/include -I$(includedir)/pixman-1
+ -I$(top_srcdir)/include -I$(includedir)/pixman-1 -I$(includedir)
Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \
$(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lX11
@@ -46,7 +46,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(LIB_DIR) \
-I$(top_srcdir)/hw/xfree86/common \
-I$(top_srcdir)/hw/xfree86/os-support \
-I$(top_srcdir)/hw/xfree86/os-support/bus \
- -I$(includedir)/pixman-1
+ -I$(includedir)/pixman-1 -I$(includedir)
libvnc_la_LDFLAGS = -module -avoid-version