aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/Makefile.am
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2014-08-11 21:22:25 +0200
committermarha <marha@users.sourceforge.net>2014-08-11 21:22:25 +0200
commit8e27619ab489dece35cc4bec86950ee7729cd309 (patch)
treeab59dbc661e00c12ed4777cf9d0d37393c4163aa /libX11/src/Makefile.am
parentffc99ce2402fe5c9a6eb8fcf193e8e9472fd993b (diff)
parentfdbedba4d50e1b28b0249c83ba11c029f096e400 (diff)
downloadvcxsrv-8e27619ab489dece35cc4bec86950ee7729cd309.tar.gz
vcxsrv-8e27619ab489dece35cc4bec86950ee7729cd309.tar.bz2
vcxsrv-8e27619ab489dece35cc4bec86950ee7729cd309.zip
Merge remote-tracking branch 'origin/released'
Conflicts: libxcb/src/c_client.py mesalib/include/GL/glext.h mesalib/include/GL/glxext.h mesalib/src/glsl/.gitignore mesalib/src/mesa/drivers/dri/common/xmlconfig.h mesalib/src/mesa/main/.gitignore xorg-server/Xext/xvmain.c xorg-server/dix/dispatch.c xorg-server/hw/xfree86/common/compiler.h
Diffstat (limited to 'libX11/src/Makefile.am')
-rw-r--r--libX11/src/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/libX11/src/Makefile.am b/libX11/src/Makefile.am
index d46b49301..ceb836625 100644
--- a/libX11/src/Makefile.am
+++ b/libX11/src/Makefile.am
@@ -398,7 +398,7 @@ lintlibdir = $(libdir)
lintlib_DATA = $(LINTLIB)
-lintlib_src = $(libX11_la_SOURCES) xcms/*.c xkb/*.c
+lintlib_src = $(libX11_la_SOURCES) $(srcdir)/xcms/*.c $(srcdir)/xkb/*.c
CLEANFILES += $(lintlib_DATA)