summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorJosh Triplett <josh@freedesktop.org>2007-06-02 22:05:16 -0700
committerJosh Triplett <josh@freedesktop.org>2007-06-02 22:05:16 -0700
commit79fa3d8070d95b960ba486f2439225872471dadd (patch)
tree23f05be9391faff15fbf4a6fcf7e3774a73acbb1 /include
parentf417570735aac865eb6b576d1ea76b5bfcd8573b (diff)
Revert "include: don't distribute XlibConf.h"
This reverts commit c9e28e05ae01ce8a29bea09df759b6271865b44c. The installed XlibInt.h includes XlibConf.h , so libX11 should ship XlibConf.h. (Commit c9e28e05ae01ce8a29bea09df759b6271865b44c didn't actually prevent automake from shipping XlibConf.h, because it used nodist_x11include_HEADERS rather than nodist_HEADERS.)
Diffstat (limited to 'include')
-rw-r--r--include/Makefile.am6
1 files changed, 2 insertions, 4 deletions
diff --git a/include/Makefile.am b/include/Makefile.am
index 5827723..c5cdb4f 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -9,12 +9,10 @@ x11include_HEADERS=\
X11/Xutil.h \
X11/cursorfont.h \
X11/Xregion.h \
- X11/ImUtil.h
-
-nodist_x11include_HEADERS=\
+ X11/ImUtil.h \
X11/XlibConf.h
-EXTRA_DIST = \
+EXTRA_DIST=\
X11/XlibConf.h.in
if XCB