diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-11 15:12:35 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-11 15:12:35 +0000 |
| commit | bb9571d3ede4adbb9396fdb25ab8e3e91aba1479 (patch) | |
| tree | 8e21e43376a5b106a5d9689a4349385101263325 /libX11/include/Makefile.am | |
| parent | d1e4f4b8546c7955c66dd023bfd6ef437db9d21d (diff) | |
| parent | f56cfbb54588917d9566277a669fa086a842b2f5 (diff) | |
| download | vcxsrv-bb9571d3ede4adbb9396fdb25ab8e3e91aba1479.tar.gz vcxsrv-bb9571d3ede4adbb9396fdb25ab8e3e91aba1479.tar.bz2 vcxsrv-bb9571d3ede4adbb9396fdb25ab8e3e91aba1479.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'libX11/include/Makefile.am')
| -rw-r--r-- | libX11/include/Makefile.am | 41 |
1 files changed, 19 insertions, 22 deletions
diff --git a/libX11/include/Makefile.am b/libX11/include/Makefile.am index 582772321..bf8fcb954 100644 --- a/libX11/include/Makefile.am +++ b/libX11/include/Makefile.am @@ -1,22 +1,19 @@ -x11includedir=${includedir}/X11 -x11include_HEADERS=\ - X11/XKBlib.h \ - X11/Xcms.h \ - X11/Xlib.h \ - X11/Xlibint.h \ - X11/Xlocale.h \ - X11/Xresource.h \ - X11/Xutil.h \ - X11/cursorfont.h \ - X11/Xregion.h \ - X11/ImUtil.h - -nodist_x11include_HEADERS=\ - X11/XlibConf.h - -EXTRA_DIST = \ - X11/XlibConf.h.in - -if XCB -x11include_HEADERS += X11/Xlib-xcb.h -endif +x11includedir=${includedir}/X11
+x11include_HEADERS=\
+ X11/XKBlib.h \
+ X11/Xcms.h \
+ X11/Xlib.h \
+ X11/Xlibint.h \
+ X11/Xlocale.h \
+ X11/Xresource.h \
+ X11/Xutil.h \
+ X11/cursorfont.h \
+ X11/Xregion.h \
+ X11/ImUtil.h \
+ X11/Xlib-xcb.h
+
+nodist_x11include_HEADERS=\
+ X11/XlibConf.h
+
+EXTRA_DIST = \
+ X11/XlibConf.h.in
|