Return to Imakefile CVS log

Up to [XFree86 CVS] / xc / programs / Xserver / xkb

 217. A rework of the way extension support is built into servers to allow for
      servers with different sets of extensions in the same build.  This starts
      with an idea introduced in David Dawes's TinyX work, and extends it to
      also apply to the Xprt, Xnest, Xvfb, Xdmx and Xsun* servers.  The changes
      include:
      - Add, as a comment, a definition for what makes an extension pervasive.
      - TOGCUP is not a pervasive extension, but XSYNC, BIGREQS and XRES are.
      - Consolidate #define's for the Xv, XvMC and XRES extensions.
      - Flip, in favour of the majority case, MITSHM's default decision WRT
        whether or not a framebuffer stores pixmap data in the server's virtual
        address space.  MI is now independent of MITSHM and MITSHM is no longer
        a pervasive extension.
      - Add a DIX helper to determine whether Xinerama is active and use it
        instead of #ifdef'ed code in all loadable modules.  Re-implement, as
        a screen wrapper, Xinerama's PaintWindow*() hacks.  Move down to DIX
        Xinerama's only MI hook.  Both MI and loadable module objects are now
        independent of Xinerama.
      - Add more XCSECURITY-related DIX helpers.  Loadable module objects that
        provide their own extensions (e.g. apm) are now independent of the core
        binary's support for XCSECURITY.
      - Extend DBE to allow for front and back buffer revalidations (to be used
        in future changes to restore the only existing example of DBE hardware
        acceleration after converting the sunffb driver to fb, XAA & Render).
        This is the change that chronologically started all this.
      - Separate Xv and XvMC extensions more cleanly.
      - Move Xserver/*/tiny directories under Xserver/hw/tinyx.
      - Fix !PrintOnlyServer builds.
      - Clean up Xserver/Imakefile.
      - Remove remaining traces of Xdec* servers.
      - Fix parallel make bug in Xserver/Imakefile caused by unintentional
        symbol re-use.
      - Accomodate XWin more cleanly by not "skipping" over Xserver/hw.
      - Remove all extension stub code (no longer needed).
      `make World` is required to correctly build these changes.  In fact, I
      recommend staring from a fresh checkout.  These changes are bundled as
      one commit due to module versioning considerations.  (Marc La France)

XCOMM $XFree86: xc/programs/Xserver/xkb/Imakefile,v 3.24tsi Exp $

#define SGIHyperOpt
#include <Server.tmpl>

#ifdef SGIArchitecture
EXTRA_ALLOC_DEFINES = -DFORCE_ALLOCA
#endif

#if BuildXInputExt
XKBXI_SRCS = xkbPrOtherEv.c
XKBXI_OBJS = xkbPrOtherEv.o
#endif

#ifdef DfltDisableXKB
XKB_DISABLE = -DXKB_DFLT_DISABLED=1
#else
XKB_DISABLE = -DXKB_DFLT_DISABLED=0
#endif

XKB_DDXDEFS = XkbServerDefines

#if defined(XF86Server) && XF86Server
XF86INCLUDES = -I$(XF86COMSRC) -I$(XF86OSSRC)
   XF86_OBJS = xf86KillSrv.o xf86VT.o xf86Private.o
#endif

#ifndef LinkDefines
#define LinkDefines /**/
#endif

 DDX_SRCS = ddxBeep.c ddxCtrls.c ddxFakeBtn.c ddxFakeMtn.c ddxInit.c \
	    ddxKeyClick.c ddxKillSrv.c ddxLEDs.c ddxVT.c ddxLoad.c \
	    ddxList.c ddxConfig.c ddxDevBtn.c ddxPrivate.c xkbconfig.c
 DDX_OBJS = ddxBeep.o ddxCtrls.o ddxFakeBtn.o ddxFakeMtn.o ddxInit.o \
	    ddxKeyClick.o ddxKillSrv.o ddxLEDs.o ddxVT.o ddxLoad.o \
	    ddxList.o ddxConfig.o ddxDevBtn.o ddxPrivate.o xkbconfig.o
     SRCS = xkb.c xkbUtils.c xkbEvents.c xkbAccessX.c xkbSwap.c \
            xkbLEDs.c xkbInit.c xkbActions.c xkbPrKeyEv.c \
	    xkmread.c xkbtext.c xkbfmisc.c xkberrs.c xkbout.c maprules.c \
	    XKBMisc.c XKBMAlloc.c XKBAlloc.c XKBGAlloc.c \
	    $(XKBXI_SRCS) $(DDX_SRCS)
     OBJS = xkb.o xkbUtils.o xkbEvents.o xkbAccessX.o xkbSwap.o \
            xkbLEDs.o xkbInit.o xkbActions.o xkbPrKeyEv.o \
	    xkmread.o xkbtext.o xkbfmisc.o xkberrs.o xkbout.o maprules.o \
	    XKBMisc.o XKBMAlloc.o XKBAlloc.o XKBGAlloc.o \
	    $(XKBXI_OBJS) $(DDX_OBJS)
   INCLUDES = -I$(SERVERSRC)/include -I$(SERVERSRC)/Xext \
	      -I$(SERVERSRC)/mi $(XF86INCLUDES)

DEFINES = -DXKB_IN_SERVER $(EXTRA_ALLOC_DEFINES) $(XKB_DDXDEFS) LinkDefines
XKB_DEFINES = -DXKB_BASE_DIRECTORY=\"$(LIBDIR)/xkb\" $(XKB_DISABLE)

NormalLibraryObjectRule()
NormalLibraryTarget(xkb,$(OBJS))
LintLibraryTarget(xkb,$(SRCS))
NormalLintTarget($(SRCS))

#if defined(XF86Server) && XF86Server
ObjectFromSpecialSource(xf86KillSrv,ddxKillSrv,-DXF86DDXACTIONS)
ObjectFromSpecialSource(xf86VT,ddxVT,-DXF86DDXACTIONS)
ObjectFromSpecialSource(xf86Private,ddxPrivate,-DXF86DDXACTIONS)
AllTarget($(XF86_OBJS))
#endif

SpecialCObjectRule(xkbInit,$(ICONFIGFILES),$(XKB_DEFINES))

LinkSourceFile(maprules.c,$(XKBFILELIBSRC))
LinkSourceFile(xkmread.c,$(XKBFILELIBSRC))
LinkSourceFile(xkbtext.c,$(XKBFILELIBSRC))
/* avoid clash between XKBMisc.c and xkbmisc.c on NT */
LinkFile(xkbfmisc.c,$(XKBFILELIBSRC)/xkbmisc.c)
LinkSourceFile(xkberrs.c,$(XKBFILELIBSRC))
LinkSourceFile(xkbconfig.c,$(XKBFILELIBSRC))
LinkSourceFile(xkbout.c,$(XKBFILELIBSRC))
LinkSourceFile(XKBMisc.c,$(XLIBSRC))
LinkSourceFile(XKBMAlloc.c,$(XLIBSRC))
LinkSourceFile(XKBAlloc.c,$(XLIBSRC))
LinkSourceFile(XKBGAlloc.c,$(XLIBSRC))

LinkSourceFile(modinit.h,$(SERVERSRC)/Xext/extmod)

#ifdef LinkDirectory

LinkSourceFile(ddxBeep.c,LinkDirectory)
LinkSourceFile(ddxConfig.c,LinkDirectory)
LinkSourceFile(ddxCtrls.c,LinkDirectory)
LinkSourceFile(ddxDevBtn.c,LinkDirectory)
LinkSourceFile(ddxFakeBtn.c,LinkDirectory)
LinkSourceFile(ddxFakeMtn.c,LinkDirectory)
LinkSourceFile(ddxInit.c,LinkDirectory)
LinkSourceFile(ddxKeyClick.c,LinkDirectory)
LinkSourceFile(ddxKillSrv.c,LinkDirectory)
LinkSourceFile(ddxLEDs.c,LinkDirectory)
LinkSourceFile(ddxList.c,LinkDirectory)
LinkSourceFile(ddxLoad.c,LinkDirectory)
LinkSourceFile(ddxPrivate.c,LinkDirectory)
LinkSourceFile(ddxVT.c,LinkDirectory)
LinkSourceFile(xkb.c,LinkDirectory)
LinkSourceFile(xkb.h,LinkDirectory)
LinkSourceFile(xkbAccessX.c,LinkDirectory)
LinkSourceFile(xkbActions.c,LinkDirectory)
LinkSourceFile(xkbDflts.h,LinkDirectory)
LinkSourceFile(xkbEvents.c,LinkDirectory)
LinkSourceFile(xkbInit.c,LinkDirectory)
LinkSourceFile(xkbLEDs.c,LinkDirectory)
LinkSourceFile(xkbPrKeyEv.c,LinkDirectory)
LinkSourceFile(xkbPrOtherEv.c,LinkDirectory)
LinkSourceFile(xkbSwap.c,LinkDirectory)
LinkSourceFile(xkbUtils.c,LinkDirectory)

#else

#if BuildLibraries
#if UseConfDirForXkb
LinkConfDirectory(xkb,.,xkb,.)
ODIR = $(CONFDIR)
#else
ODIR = $(LIBDIR)
#endif
#ifdef VarDbDirectory
NDIR = $(VARDBDIR)
#else
NDIR = $(CONFDIR)
#endif
#if !UseConfDirForXkb || defined(VarDbDirectory)
LinkConfDirectoryLong(xkb,xkb,compiled,compiled,$(ODIR),$(NDIR))
#endif
#endif

#endif /* defined(LinkDirectory) */

DependTarget()