diff options
| author | Eamon Walsh <ewalsh@tycho.nsa.gov> | 2006-09-05 18:03:25 -0400 |
|---|---|---|
| committer | Eamon Walsh <ewalsh@moss-uranus.epoch.ncsc.mil> | 2006-09-05 18:03:25 -0400 |
| commit | 0b81fccd2ee4e054e5cffb739de07460ff2c13f7 (patch) | |
| tree | cd754982e30fc37bf8f36cd5dd873b07b278eb4e /Xext/Makefile.am | |
| parent | 20c4ac6e038607ebbf6c04639670514c016d8597 (diff) | |
| parent | c2813514cf7b1a36caa848cbc2ceef99cf2eb769 (diff) | |
Merge branch 'master' into my-XACE-modular
Conflicts:
configure.ac
Diffstat (limited to 'Xext/Makefile.am')
| -rw-r--r-- | Xext/Makefile.am | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am index 4d77e2fbe..4deb8e52c 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -82,6 +82,12 @@ SERVERCONFIG_DATA = SecurityPolicy AM_CFLAGS += -DDEFAULTPOLICYFILE=\"$(SERVERCONFIGdir)/SecurityPolicy\" endif +XCALIBRATE_SRCS = xcalibrate.c +if XCALIBRATE +BUILTIN_SRCS += $(XCALIBRATE_SRCS) +# XCalibrare needs tslib +endif + # X EVent Interception Extension: allows accessibility helpers & composite # managers to intercept events from input devices and transform as needed # before the clients see them. @@ -158,6 +164,7 @@ EXTRA_DIST = \ $(SCREENSAVER_SRCS) \ $(XACE_SRCS) \ $(XCSECURITY_SRCS) \ + $(XCALIBRATE_SRCS) \ $(XINERAMA_SRCS) \ $(XEVIE_SRCS) \ $(XPRINT_SRCS) \ |