diff options
| author | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-07-27 19:02:39 +0000 |
|---|---|---|
| committer | Matthieu Herrb <matthieu@cvs.openbsd.org> | 2010-07-27 19:02:39 +0000 |
| commit | 269d40cbcc43b41f621ca6d91c182952f60ec48e (patch) | |
| tree | 872f2fddd3f2207e57a28595e73886713ce4a77a /xserver/Xext/Makefile.am | |
| parent | 917a2249b787451cad3f9697872aeccfd0da3324 (diff) | |
Update to xserver 1.8. Tested by many. Ok oga@, todd@.
Diffstat (limited to 'xserver/Xext/Makefile.am')
| -rw-r--r-- | xserver/Xext/Makefile.am | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/xserver/Xext/Makefile.am b/xserver/Xext/Makefile.am index 2f5c98b90..53cbc1fbd 100644 --- a/xserver/Xext/Makefile.am +++ b/xserver/Xext/Makefile.am @@ -26,11 +26,13 @@ BUILTIN_SRCS = \ sleepuntil.c \ sleepuntil.h \ sync.c \ + syncsrv.h \ xcmisc.c \ xtest.c # Sources always included in libXextmodule.la & libXext.la. That's right, zero. MODULE_SRCS = +MODULE_LIBS = # Optional sources included if extension enabled by configure.ac rules @@ -62,6 +64,9 @@ endif XINERAMA_SRCS = panoramiX.c panoramiX.h panoramiXh.h panoramiXsrv.h panoramiXprocs.c panoramiXSwap.c if XINERAMA BUILTIN_SRCS += $(XINERAMA_SRCS) +if XORG +sdk_HEADERS += panoramiXsrv.h panoramiX.h +endif endif # X-ACE extension: provides hooks for building security policy extensions @@ -69,13 +74,17 @@ endif XACE_SRCS = xace.c xace.h xacestr.h if XACE BUILTIN_SRCS += $(XACE_SRCS) +if XORG +sdk_HEADERS += xace.h xacestr.h +endif endif # SELinux extension: provides SELinux policy support for X objects # requires X-ACE extension -XSELINUX_SRCS = xselinux.c xselinux.h +XSELINUX_SRCS = xselinux_ext.c xselinux_hooks.c xselinux_label.c xselinux.h xselinuxint.h if XSELINUX MODULE_SRCS += $(XSELINUX_SRCS) +MODULE_LIBS += $(SELINUX_LIBS) endif # Security extension: multi-level security to protect clients from each other @@ -98,7 +107,7 @@ MODULE_SRCS += $(MULTIBUFFER_SRCS) endif # XF86 Big Font extension -BIGFONT_SRCS = xf86bigfont.c +BIGFONT_SRCS = xf86bigfont.c xf86bigfontsrv.h if XF86BIGFONT BUILTIN_SRCS += $(BIGFONT_SRCS) endif @@ -112,11 +121,13 @@ endif # Now take all of the above, mix well, bake for 10 minutes and get libXext*.la libXext_la_SOURCES = $(BUILTIN_SRCS) $(MODULE_SRCS) +libXext_la_LIBADD = $(MODULE_LIBS) if XORG libXextbuiltin_la_SOURCES = $(BUILTIN_SRCS) libXextmodule_la_SOURCES = $(MODULE_SRCS) +libXextmodule_la_LIBADD = $(MODULE_LIBS) endif EXTRA_DIST = \ @@ -126,6 +137,7 @@ EXTRA_DIST = \ $(SCREENSAVER_SRCS) \ $(XACE_SRCS) \ $(XCSECURITY_SRCS) \ + $(XSELINUX_SRCS) \ $(XCALIBRATE_SRCS) \ $(XINERAMA_SRCS) \ $(MULTIBUFFER_SRCS) \ |