diff options
| author | Kevin E Martin <kem@kem.org> | 2005-11-29 16:39:33 +0000 |
|---|---|---|
| committer | Kevin E Martin <kem@kem.org> | 2005-11-29 16:39:33 +0000 |
| commit | da5d66f2ff27b21fe5c39a4abb4f627edd707f1d (patch) | |
| tree | ad479b2ead1b745fc1eb056456c2126f8e18f947 /Xext/Makefile.am | |
| parent | 51a721a6dbb42702347aad3115147e4922fc1a25 (diff) | |
Fix usage of XFree86LOADER/XFree86Module/IN_MODULE and update loadable
module builds to reflect this change.
Diffstat (limited to 'Xext/Makefile.am')
| -rw-r--r-- | Xext/Makefile.am | 45 |
1 files changed, 42 insertions, 3 deletions
diff --git a/Xext/Makefile.am b/Xext/Makefile.am index aee6fb84c..de5f6e73d 100644 --- a/Xext/Makefile.am +++ b/Xext/Makefile.am @@ -1,8 +1,14 @@ -noinst_LTLIBRARIES = libXext.la +# 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 +noinst_LTLIBRARIES = libXext.la libXextbuiltin.la libXextmodule.la -INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod +INCLUDES = -I$(top_srcdir)/hw/xfree86/dixmods/extmod -I$(top_srcdir)/hw/xfree86/os-support -AM_CFLAGS = $(DIX_CFLAGS) +AM_CFLAGS = $(DIX_CFLAGS) @LOADER_DEFINES@ sdk_HEADERS = xvdix.h xvmcext.h @@ -95,3 +101,36 @@ libXext_la_SOURCES = \ $(EVI_SRCS) \ $(MULTIBUFFER_SRCS) \ $(FONTCACHE_SRCS) + +libXextbuiltin_la_SOURCES = \ + shape.c \ + sleepuntil.c \ + sleepuntil.h \ + xtest.c \ + xtest1di.c \ + xtest1dd.c \ + xtest1dd.h \ + xf86bigfont.c \ + $(MITSHM_SRCS) \ + $(PANORAMIX_SRCS) \ + $(XCSECURITY_SRCS) \ + $(XEVIE_SRCS) \ + $(XPRINT_SRCS) \ + $(APPGROUP_SRCS) + +libXextmodule_la_CFLAGS = $(AM_CFLAGS) @MODULE_DEFINES@ -DEXTMODULE +libXextmodule_la_SOURCES = \ + bigreq.c \ + mitmisc.c \ + shape.c \ + sync.c \ + xcmisc.c \ + dpms.c \ + dpmsproc.h \ + $(XV_SRCS) \ + $(RES_SRCS) \ + $(SCREENSAVER_SRCS) \ + $(CUP_SRCS) \ + $(EVI_SRCS) \ + $(MULTIBUFFER_SRCS) \ + $(FONTCACHE_SRCS) |