include/dix-config.h.in Add support for more extensions
Add missing files to EXTRA_DIST
This commit is contained in:
Kevin E Martin
parent
ccfe9e7e9b
commit
1859c62607
21
ChangeLog
21
ChangeLog
|
|
@ -1,3 +1,24 @@
|
|||
2005-10-17 Kevin E. Martin <kem-at-freedesktop-dot-org>
|
||||
|
||||
* configure.ac:
|
||||
* Xext/Makefile.am:
|
||||
* include/dix-config.h.in
|
||||
Add support for more extensions
|
||||
|
||||
* GL/Makefile.am:
|
||||
* XTrap/Makefile.am:
|
||||
* hw/xfree86/os-support/Makefile.am:
|
||||
* hw/xfree86/os-support/bsd/Makefile.am:
|
||||
* hw/xfree86/os-support/bus/Makefile.am:
|
||||
* hw/xfree86/os-support/linux/Makefile.am:
|
||||
* hw/xfree86/os-support/linux/int10/Makefile.am:
|
||||
* hw/xfree86/os-support/misc/Makefile.am:
|
||||
* hw/xfree86/os-support/solaris/Makefile.am:
|
||||
* hw/xfree86/vgahw/Makefile.am:
|
||||
* hw/xfree86/x86emu/Makefile.am:
|
||||
* os/Makefile.am:
|
||||
Add missing files to EXTRA_DIST
|
||||
|
||||
2005-10-15 Donnie Berkholz <spyderous@gentoo.org>
|
||||
|
||||
* configure.ac: Change '==' to portable '='.
|
||||
|
|
|
|||
|
|
@ -4,4 +4,13 @@ SUBDIRS = glx mesa include
|
|||
|
||||
# xwin/darwin/xfree86 have their accel support under the DDX
|
||||
|
||||
EXTRA_DIST = symlink-mesa.sh
|
||||
APPLE_EXTRAS = \
|
||||
apple/aglGlx.c \
|
||||
apple/indirect.c
|
||||
WINDOWS_EXTRAS = \
|
||||
windows/ChangeLog \
|
||||
windows/glwindows.h \
|
||||
windows/glwrap.c \
|
||||
windows/indirect.c
|
||||
|
||||
EXTRA_DIST = symlink-mesa.sh $(APPLE_EXTRAS) $(WINDOWS_EXTRAS)
|
||||
|
|
|
|||
|
|
@ -1 +0,0 @@
|
|||
sdk_HEADERS = dri.h dristruct.h sarea.h
|
||||
|
|
@ -3,3 +3,6 @@ noinst_LTLIBRARIES = libxtrap.la
|
|||
AM_CFLAGS = $(DIX_CFLAGS)
|
||||
|
||||
libxtrap_la_SOURCES = xtrapddmi.c xtrapdi.c xtrapdiswp.c xtrapditbl.c
|
||||
|
||||
# FIXME: Shouldn't this be used if we're to load xtrap as a module?
|
||||
EXTRA_DIST = xf86XTrapModule.c
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ MITSHM_SRCS = shm.c
|
|||
endif
|
||||
|
||||
if XV
|
||||
XV_SRCS = xvmain.c xvdisp.c xvmc.c xvdix.h xvmcext.h
|
||||
XV_SRCS = xvmain.c xvdisp.c xvmc.c xvdix.h xvmcext.h xvdisp.h
|
||||
endif
|
||||
|
||||
if RES
|
||||
|
|
@ -34,20 +34,39 @@ PANORAMIX_SRCS = panoramiX.c panoramiX.h panoramiXh.h panoramiXsrv.h panoramiXpr
|
|||
endif
|
||||
|
||||
if XEVIE
|
||||
XEVIE_SRCS = xevie.c EVIstruct.h
|
||||
XEVIE_SRCS = xevie.c
|
||||
endif
|
||||
|
||||
if XPRINT
|
||||
XPRINT_SRCS = xprint.c
|
||||
endif
|
||||
|
||||
EXTRA_DIST = \
|
||||
appgroup.h \
|
||||
xvdisp.h \
|
||||
README.xtest1-ddx \
|
||||
SecurityPolicy
|
||||
if APPGROUP
|
||||
APPGROUP_SRCS = appgroup.c appgroup.h
|
||||
endif
|
||||
|
||||
if CUP
|
||||
CUP_SRCS = cup.c
|
||||
endif
|
||||
|
||||
if EVI
|
||||
EVI_SRCS = EVI.c sampleEVI.c EVIstruct.h
|
||||
endif
|
||||
|
||||
if MULTIBUFFER
|
||||
MULTIBUFFER_SRCS = mbuf.c
|
||||
endif
|
||||
EXTRA_MULTIBUFFER_SRCS = mbufbf.c mbufpx.c
|
||||
|
||||
if FONTCACHE
|
||||
FONTCACHE_SRCS = fontcache.c
|
||||
endif
|
||||
|
||||
EXTRA_DIST = \
|
||||
README.xtest1-ddx \
|
||||
SecurityPolicy \
|
||||
$(EXTRA_MULTIBUFFER_SRCS)
|
||||
|
||||
# dmx.c has a hard dependency on the dmx DDX
|
||||
libXext_la_SOURCES = \
|
||||
bigreq.c \
|
||||
mitmisc.c \
|
||||
|
|
@ -70,5 +89,9 @@ libXext_la_SOURCES = \
|
|||
$(PANORAMIX_SRCS) \
|
||||
$(XCSECURITY_SRCS) \
|
||||
$(XEVIE_SRCS) \
|
||||
$(XPRINT_SRCS)
|
||||
|
||||
$(XPRINT_SRCS) \
|
||||
$(APPGROUP_SRCS) \
|
||||
$(CUP_SRCS) \
|
||||
$(EVI_SRCS) \
|
||||
$(MULTIBUFFER_SRCS) \
|
||||
$(FONTCACHE_SRCS)
|
||||
|
|
|
|||
45
configure.ac
45
configure.ac
|
|
@ -348,7 +348,12 @@ AC_ARG_ENABLE(xf86vidmode, [ --disable-xf86vidmode ], [XF86VIDMODE=$enableval
|
|||
AC_ARG_ENABLE(xf86misc, [ --disable-xf86misc ], [XF86MISC=$enableval], [XF86MISC=yes])
|
||||
AC_ARG_ENABLE(xcsecurity, AS_HELP_STRING([--enable-xcsecurity], [Build Security extension (default: disabled)]),[XCSECURITY=$enableval],[XCSECURITY=no])
|
||||
AC_ARG_ENABLE(xevie, AS_HELP_STRING([--enable-xevie], [Build XEvIE extension (default: disabled)]), [XEVIE=$enableval], [XEVIE=no])
|
||||
AC_ARG_ENABLE(lbx, AS_HELP_STRING([ --enable-lbx ], [Build LBX (default: no)]), [LBX=$enableval], [LBX=no])
|
||||
AC_ARG_ENABLE(lbx, AS_HELP_STRING([ --enable-lbx ], [Build LBX extension (default: no)]), [LBX=$enableval], [LBX=no])
|
||||
AC_ARG_ENABLE(appgroup, AS_HELP_STRING([ --enable-appgroup ], [Build XC-APPGROUP extension (default: yes)]), [APPGROUP=$enableval], [APPGROUP=yes])
|
||||
AC_ARG_ENABLE(cup, AS_HELP_STRING([ --enable-cup ], [Build TOG-CUP extension (default: yes)]), [CUP=$enableval], [CUP=yes])
|
||||
AC_ARG_ENABLE(evi, AS_HELP_STRING([ --enable-evi ], [Build Extended-Visual-Information extension (default: yes)]), [EVI=$enableval], [EVI=yes])
|
||||
AC_ARG_ENABLE(multibuffer, AS_HELP_STRING([ --enable-multibuffer ], [Build Multibuffer extension (default: no)]), [MULTIBUFFER=$enableval], [MULTIBUFFER=no])
|
||||
AC_ARG_ENABLE(fontcache, AS_HELP_STRING([ --enable-fontcache ], [Build FontCache extension (default: no)]), [FONTCACHE=$enableval], [FONTCACHE=no])
|
||||
|
||||
dnl DDXes.
|
||||
AC_ARG_ENABLE(xorg, AS_HELP_STRING([--enable-xorg], [Build Xorg server (default: auto)]), [XORG=$enableval], [XORG=auto])
|
||||
|
|
@ -474,11 +479,6 @@ if test "x$xRES" = xyes; then
|
|||
REQUIRED_MODULES="$REQUIRED_MODULES resourceproto"
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(XCSECURITY, [test "x$XCSECURITY" = xyes])
|
||||
if test "x$XCSECURITY" = xyes; then
|
||||
AC_DEFINE(XCSECURITY, 1, [Build Security extension])
|
||||
fi
|
||||
|
||||
if test "x$GLX" = xyes && ! test "x$MESA_SOURCE" = x; then
|
||||
AC_DEFINE(GLXEXT, 1, [Build GLX extension])
|
||||
GLX_LIBS='$(top_builddir)/GL/glx/libglx.la $(top_builddir)/GL/mesa/libGLcore.la'
|
||||
|
|
@ -528,6 +528,39 @@ if test "x$XEVIE" = xyes; then
|
|||
REQUIRED_MODULES="$REQUIRED_MODULES evieproto"
|
||||
fi
|
||||
|
||||
if test "x$APPGROUP" = xyes && test "x$XCSECURITY" != xyes; then
|
||||
AC_MSG_NOTICE([Disabling APPGROUP extension])
|
||||
APPGROUP=no
|
||||
fi
|
||||
AM_CONDITIONAL(APPGROUP, [test "x$APPGROUP" = xyes])
|
||||
if test "x$APPGROUP" = xyes; then
|
||||
AC_DEFINE(XAPPGROUP, 1, [Build APPGROUP extension])
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(CUP, [test "x$CUP" = xyes])
|
||||
if test "x$CUP" = xyes; then
|
||||
AC_DEFINE(TOGCUP, 1, [Build TOG-CUP extension])
|
||||
# Requires xextproto which is always required
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(EVI, [test "x$EVI" = xyes])
|
||||
if test "x$EVI" = xyes; then
|
||||
AC_DEFINE(EVI, 1, [Build Extended-Visual-Information extension])
|
||||
# Requires xextproto which is always required
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(MULTIBUFFER, [test "x$MULTIBUFFER" = xyes])
|
||||
if test "x$MULTIBUFFER" = xyes; then
|
||||
AC_DEFINE(MULTIBUFFER, 1, [Build Multibuffer extension])
|
||||
# Requires xextproto which is always required
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(FONTCACHE, [test "x$FONTCACHE" = xyes])
|
||||
if test "x$FONTCACHE" = xyes; then
|
||||
AC_DEFINE(FONTCACHE, 1, [Build FontCache extension])
|
||||
REQUIRED_MODULES="$REQUIRED_MODULES fontcacheproto"
|
||||
fi
|
||||
|
||||
if test "x$XF86VIDMODE" = xyes; then
|
||||
AC_DEFINE(XF86VIDMODE, 1, [Support XFree86 Video Mode extension])
|
||||
fi
|
||||
|
|
|
|||
|
|
@ -23,3 +23,9 @@ xorgos.c:
|
|||
touch $@
|
||||
|
||||
DISTCLEANFILES = xorgos.c
|
||||
|
||||
# FIXME: These don't seem to be used anywhere
|
||||
EXTRA_DIST += \
|
||||
shared/bios_devmem.c \
|
||||
shared/inout.S \
|
||||
shared/kbd.c
|
||||
|
|
|
|||
|
|
@ -74,3 +74,20 @@ libbsd_la_SOURCES = \
|
|||
$(DRI_SOURCES) \
|
||||
$(KMOD_SOURCES) \
|
||||
$(RES_SOURCES)
|
||||
|
||||
# FIXME: Add these files to the build as needed
|
||||
EXTRA_DIST = \
|
||||
bsd_apm.c \
|
||||
bsd_jstk.c \
|
||||
bsd_kbd.h \
|
||||
bsd_kqueue_apm.c \
|
||||
bsdResource.c \
|
||||
memrange.h \
|
||||
libusb/data.c \
|
||||
libusb/descr.c \
|
||||
libusb/parse.c \
|
||||
libusb/usage.c \
|
||||
libusb/usb.3 \
|
||||
libusb/usb.h \
|
||||
libusb/usb_hid_usages \
|
||||
libusb/usbvar.h
|
||||
|
|
|
|||
|
|
@ -26,7 +26,13 @@ AM_CFLAGS = $(XORG_CFLAGS)
|
|||
# hack to keep all the OS PCI support files in the distball even though
|
||||
# there aren't rules to build them all yet. also the AC_SUBST pattern
|
||||
# above will defeat automake's EXTRA_DIST logic, woo.
|
||||
PCIDISTSOURCES = axpPci.c freebsdPci.c linuxPci.c netbsdPci.c sparcPci.c
|
||||
PCIDISTSOURCES = \
|
||||
axpPci.c \
|
||||
freebsdPci.c \
|
||||
linuxPci.c \
|
||||
netbsdPci.c \
|
||||
ppcPci.c \
|
||||
sparcPci.c
|
||||
|
||||
EXTRA_DIST = \
|
||||
460gxPCI.h \
|
||||
|
|
|
|||
|
|
@ -26,7 +26,18 @@ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
|
|||
|
||||
INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack
|
||||
|
||||
# FIXME: These need to be added to the build
|
||||
LNX_EXTRA_SOURCES = \
|
||||
lnx_acpi.c \
|
||||
lnx_apm.c \
|
||||
lnx_axp.c \
|
||||
lnx_font.c \
|
||||
lnx_ia64.c \
|
||||
lnx_jstk.c \
|
||||
lnxResource.c
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(LNX_EXTRA_SOURCES) \
|
||||
lnx.h \
|
||||
lnx_kbd.h \
|
||||
$(srcdir)/../shared/ia64Pci.h \
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
INCLUDES = -I$(srcdir)/../../../int10
|
||||
|
||||
AM_CFLAGS = $(XORG_CFLAGS)
|
||||
|
||||
noinst_LIBRARIES = libxorglinuxint10.a
|
||||
libxorglinuxint10_a_SOURCES = linux.c ../../../int10/helper_mem.c \
|
||||
../../../int10/pci.c \
|
||||
../../../int10/xf86int10module.c
|
||||
|
|
@ -1,9 +1,23 @@
|
|||
# FIXME: Add the *.S files to build when applicable
|
||||
I386_SOURCES = BUSmemcpy.S IODelay.S SlowBcopy.S
|
||||
OTHER_SOURCES = BUSmemcpy.c IODelay.c SlowBcopy.c
|
||||
|
||||
ARCH_SOURCES = $(OTHER_SOURCES)
|
||||
|
||||
# FIXME: Add to the build (NeedPortIO)
|
||||
PORTIO_SOURCES = PortIO.S
|
||||
|
||||
# FIXME: Add to the build (if HasGcc || HasGcc2)
|
||||
ILHACK_SOURCES = xf86_IlHack.c
|
||||
|
||||
noinst_LTLIBRARIES = libmisc.la
|
||||
|
||||
libmisc_la_SOURCES = Delay.c IODelay.c BUSmemcpy.c SlowBcopy.c
|
||||
libmisc_la_SOURCES = xf86_Util.c Delay.c $(ARCH_SOURCES)
|
||||
|
||||
#AM_LDFLAGS = -r
|
||||
|
||||
INCLUDES = $(XORG_INCS)
|
||||
|
||||
AM_CFLAGS = $(XORG_CFLAGS)
|
||||
|
||||
EXTRA_DIST = $(I386_SOURCES) $(PORTIO_SOURCES) $(ILHACK_SOURCES)
|
||||
|
|
|
|||
|
|
@ -3,8 +3,8 @@ IO_SRC = $(srcdir)/../sysv/sysv_io.c
|
|||
KBD_SRCS = $(srcdir)/../shared/sysv_kbd.c $(srcdir)/../shared/std_kbdEv.c
|
||||
VTSW_SRC = $(srcdir)/../shared/VTsw_usl.c
|
||||
else
|
||||
IO_SRC = sun_io.c
|
||||
KBD_SRCS = sun_kbd.c sun_kbdEv.c
|
||||
IO_SRC = sun_io.c sun_kbd.h
|
||||
KBD_SRCS = sun_kbd.c sun_kbdEv.c sun_kbd.h
|
||||
VTSW_SRC = $(srcdir)/../shared/VTsw_noop.c
|
||||
endif
|
||||
|
||||
|
|
@ -39,5 +39,4 @@ AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
|
|||
INCLUDES = $(XORG_INCS)
|
||||
|
||||
EXTRA_DIST = solaris-amd64.S solaris-ia32.S solaris-sparcv8plus.S \
|
||||
apSolaris.shar
|
||||
|
||||
apSolaris.shar sun_inout.s
|
||||
|
|
|
|||
|
|
@ -5,3 +5,5 @@ INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c
|
|||
AM_CFLAGS = $(XORG_CFLAGS)
|
||||
|
||||
sdk_HEADERS = vgaHW.h
|
||||
|
||||
EXTRA_DIST = vgaCmap.c
|
||||
|
|
|
|||
|
|
@ -13,7 +13,8 @@ INCLUDES =
|
|||
|
||||
AM_CFLAGS = $(XORG_CFLAGS)
|
||||
|
||||
EXTRA_DIST = x86emu/debug.h \
|
||||
EXTRA_DIST = validate.c \
|
||||
x86emu/debug.h \
|
||||
x86emu/decode.h \
|
||||
x86emu/fpu.h \
|
||||
x86emu/fpu_regs.h \
|
||||
|
|
|
|||
|
|
@ -353,13 +353,25 @@
|
|||
/* Support XTrap extension */
|
||||
#undef XTRAP
|
||||
|
||||
/* Support Xv Extension */
|
||||
/* Support Xv extension */
|
||||
#undef XV
|
||||
|
||||
/* Build LBX */
|
||||
/* Build LBX extension */
|
||||
#undef LBX
|
||||
|
||||
/* Support DRI support */
|
||||
/* Build APPGROUP extension */
|
||||
#undef XAPPGROUP
|
||||
|
||||
/* Build TOG-CUP extension */
|
||||
#undef TOGCUP
|
||||
|
||||
/* Build Extended-Visual-Information extension */
|
||||
#undef EVI
|
||||
|
||||
/* Build Multibuffer extension */
|
||||
#undef MULTIBUFFER
|
||||
|
||||
/* Support DRI extension */
|
||||
#undef XF86DRI
|
||||
|
||||
/* Vendor name */
|
||||
|
|
|
|||
|
|
@ -2,12 +2,10 @@ noinst_LTLIBRARIES = libos.la
|
|||
|
||||
AM_CFLAGS = $(DIX_CFLAGS)
|
||||
|
||||
# k5auth.c \
|
||||
# rpcauth.c \
|
||||
# genalloca.c \
|
||||
# hpsocket.c \
|
||||
# secauth.c
|
||||
# xalloc.c
|
||||
# FIXME: Add support for these in configure.ac
|
||||
K5AUTH_SOURCES = k5auth.c
|
||||
SECURERPC_SOURCES = rpcauth.c
|
||||
INTERNALMALLOC_SOURCES = xalloc.c
|
||||
|
||||
if XCSECURITY
|
||||
XCSECURITY_SOURCES = secauth.c
|
||||
|
|
@ -41,3 +39,5 @@ libos_la_SOURCES = \
|
|||
$(XDMCP_SOURCES) \
|
||||
$(XORG_SOURCES) \
|
||||
$(LBX_SOURCES)
|
||||
|
||||
EXTRA_DIST = $(K5AUTH_SOURCES) $(SECURERPC_SOURCES) $(INTERNALMALLOC_SOURCES)
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user