diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2010-03-12 16:37:28 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2010-03-12 16:37:28 +1000 |
| commit | c25b34fe61cb3fc7c3583a8ccf62c470cc8ead06 (patch) | |
| tree | 15c79c4c385ef27db236f80933778bd5cf37dab0 /Xext | |
| parent | 3ae6a3779d9040a4d7c3e1b7901117e24e0d3ecf (diff) | |
| parent | ff5fb43a4b38c707a1a9948ace621a62b5b2457a (diff) | |
Merge branch 'server-1.7-nominations' into server-1.7-branch
Diffstat (limited to 'Xext')
| -rw-r--r-- | Xext/Makefile.am | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am index ac45f955a..4f05ce9f1 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -32,6 +32,7 @@ BUILTIN_SRCS = \ # 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 @@ -83,6 +84,7 @@ endif XSELINUX_SRCS = xselinux.c xselinux.h if XSELINUX MODULE_SRCS += $(XSELINUX_SRCS) +MODULE_LIBS += $(SELINUX_LIBS) endif # Security extension: multi-level security to protect clients from each other @@ -119,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 = \ |