diff options
| author | Daniel Stone <daniel@fooishbar.org> | 2012-07-10 02:03:14 +0100 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2012-07-10 00:01:49 -0700 |
| commit | b905d87ba0a9b045ea41bb1ad36a4f9f1170a1b8 (patch) | |
| tree | e0a855a494934d43f4ba358aeac9bde51f540695 /Xext | |
| parent | a7a2f9f66ddc27df96557093f3dd266e24eb653b (diff) | |
Xext: Only build one library
Now that libXextmodule.la is both empty and unused, we can just build
the one libXext.la for everyone, rather than having Xorg be special and
unique.
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 | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am index 0420951ab..8e31f1367 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -1,14 +1,4 @@ -# libXext.la: includes all extensions and should be linked into Xvfb, -# Xnest, Xdmx and Xprt -# libXextbuiltin.la: includes those extensions that are built directly into -# Xorg by default -# libXextmodule.la: includes those extensions that are built into a module -# that Xorg loads -if XORG -noinst_LTLIBRARIES = libXext.la libXextbuiltin.la libXextmodule.la -else noinst_LTLIBRARIES = libXext.la -endif AM_CFLAGS = $(DIX_CFLAGS) @@ -30,10 +20,6 @@ BUILTIN_SRCS = \ xtest.c BUILTIN_LIBS = -# 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 # MIT Shared Memory extension @@ -107,16 +93,8 @@ 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 = $(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) -endif +libXext_la_SOURCES = $(BUILTIN_SRCS) +libXext_la_LIBADD = $(BUILTIN_LIBS) EXTRA_DIST = \ $(MITSHM_SRCS) \ |