diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-07-10 02:03:09 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-09 23:28:37 -0700 |
| commit | 6fb481d1251626456914d0012d6ca5a342bfdf71 (patch) | |
| tree | b9dbf24b20b0f94e7ddc3d6e989d27bad8d4cdad /Xext | |
| parent | 5d92ee4081a23a6b4d1f9ba2a98985f539f99312 (diff) | |
Move SELinux from extmod to built-in
Instead of letting it languish in extmod just because we want to
configure bits of it from xf86, move XSELinux to the builtin part of
Xext, and do its configuration from xf86ExtensionInit.
Signed-off-by: Daniel Stone <daniel@fooishbar.org>
Reviewed-by: Jamey Sharp <jamey@minilop.net>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/Makefile.am | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am index 98e9917d9..957fa671a 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -30,6 +30,7 @@ BUILTIN_SRCS = \ syncsrv.h \ xcmisc.c \ xtest.c +BUILTIN_LIBS = # Sources always included in libXextmodule.la & libXext.la. That's right, zero. MODULE_SRCS = @@ -84,8 +85,8 @@ endif # requires X-ACE extension 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) +BUILTIN_SRCS += $(XSELINUX_SRCS) +BUILTIN_LIBS += $(SELINUX_LIBS) endif # Security extension: multi-level security to protect clients from each other @@ -109,10 +110,11 @@ 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) +libXext_la_LIBADD = $(BUILTIN_LIBS) $(MODULE_LIBS) if XORG libXextbuiltin_la_SOURCES = $(BUILTIN_SRCS) +libXextbuiltin_la_LIBADD = $(BUILTIN_LIBS) libXextmodule_la_SOURCES = $(MODULE_SRCS) libXextmodule_la_LIBADD = $(MODULE_LIBS) |