Browse Source

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
tags/v0.0.90
Peter Åstrand 15 years ago
parent
commit
97270a7da3
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      unix/xserver/hw/vnc/Makefile.am

+ 3
- 3
unix/xserver/hw/vnc/Makefile.am View File

@@ -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


Loading…
Cancel
Save