summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAaron Plattner <aplattner@nvidia.com>2009-07-23 15:16:44 -0700
committerAaron Plattner <aplattner@nvidia.com>2009-07-23 15:32:20 -0700
commit7c6b5458de9bc7f6cd972a36b56888aaa3d201ee (patch)
treeef2515f1e4ad7f40f9d4e58dbd47ef72d3808800
parent20daa145c437c3ba67970146f6182849f87a1b43 (diff)
Fix dist.
* Makefile.am: Include the test/ subdirectory in the dist tarball. * include/Makefile.am: Move events.h to sdk_HEADERS and eventconvert.h to EXTRA_DIST so they're included in the tarball. events.h shouldn't be included in the SDK either, but for now it's needed by input.h.
-rw-r--r--Makefile.am3
-rw-r--r--include/Makefile.am6
2 files changed, 6 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am
index 4ee1e179d..cf1469ff7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -80,7 +80,8 @@ DIST_SUBDIRS = \
glx \
exa \
config \
- hw
+ hw \
+ test
# gross hack
relink: all
diff --git a/include/Makefile.am b/include/Makefile.am
index fda4b70ac..50b75c200 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -17,6 +17,7 @@ sdk_HEADERS = \
dixfontstr.h \
dixgrabs.h \
dixstruct.h \
+ events.h \
exevents.h \
extension.h \
extinit.h \
@@ -57,10 +58,11 @@ sdk_HEADERS = \
xkbrules.h \
xserver-properties.h
-nodist_sdk_HEADERS = xorg-server.h events.h eventconvert.h
+nodist_sdk_HEADERS = xorg-server.h
endif
AM_CFLAGS = $(DIX_CFLAGS)
EXTRA_DIST = \
- dix-config-apple-verbatim.h
+ dix-config-apple-verbatim.h \
+ eventconvert.h