diff options
author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-01-26 13:55:07 +1030 |
---|---|---|
committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-01-26 13:55:07 +1030 |
commit | 0ac175597712edfeae676f536746a4d26d625e30 (patch) | |
tree | bd34a9601dc6f1a446646e0907e49c90c6862cc0 /Xext/Makefile.am | |
parent | 210eeef495770c1883c842ff003c28ce25f279d4 (diff) | |
parent | e915a2639752bc0ea9e6e192e020cc2031c08063 (diff) |
Merge branch 'master' into mpx
Conflicts:
Xext/sampleEVI.c
Diffstat (limited to 'Xext/Makefile.am')
-rw-r--r-- | Xext/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am index 4f0429e7b..9cfb458cf 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -77,7 +77,7 @@ endif # requires X-ACE extension XSELINUX_SRCS = xselinux.c xselinux.h if XSELINUX -BUILTIN_SRCS += $(XSELINUX_SRCS) +MODULE_SRCS += $(XSELINUX_SRCS) endif # Security extension: multi-level security to protect clients from each other |