diff options
| author | Joel Bosveld <joel.bosveld@gmail.com> | 2009-09-08 23:06:00 +0800 |
|---|---|---|
| committer | Joel Bosveld <joel.bosveld@gmail.com> | 2009-09-08 23:55:13 +0800 |
| commit | 1ba17340a98a34b40f78442963aa4132e6cfae5c (patch) | |
| tree | d11d814844e4ad037d146133250b73f28cdb3e31 /Makefile.am | |
| parent | 5e38708c3466129c3e5af40a915c044bb26e083f (diff) | |
| parent | 1bdc9ec617d357b076c9e69296018bc212d91c7d (diff) | |
Conflicts:
test/Makefile.am
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index dea6fa47c..cf1469ff7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -38,7 +38,8 @@ SUBDIRS = \ $(GLX_DIR) \ exa \ config \ - hw + hw \ + test aclocaldir = $(datadir)/aclocal aclocal_DATA = xorg-server.m4 @@ -79,7 +80,8 @@ DIST_SUBDIRS = \ glx \ exa \ config \ - hw + hw \ + test # gross hack relink: all |