andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move drm up to os-support since the files are shared by multiple platforms.

Browse Source 
Fix the dri and drm build. Fix server-side DMX extension build. Make
    xf4bpp use the correct version of mfbline.c for mfbseg.c. Add #ifndef
    _HEADERNAME_H_/#define _HEADERNAME_H_/.../#endif to the headers.
This commit is contained in:
Kevin E Martin 2005-07-15 22:51:05 +00:00
parent eb6fa0dc15
commit a407fa373b
12 changed files with 67 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -390,10 +390,11 @@ AC_SUBST([MESA_SOURCE])
AM_CONDITIONAL(DRI, test x$DRI = xyes)
if test "$DRI" = yes; then
AC_DEFINE(XORGDRI,1,[Build DRI extension])
AC_DEFINE(_XORGDRI_SERVER_,1,[XORGDRI internal define])
AC_DEFINE(XF86DRI,1,[Build DRI extension])
PKG_CHECK_MODULES([DRIPROTO], [xf86driproto])
AC_SUBST(DRIPROTO_CFLAGS)
PKG_CHECK_MODULES([LIBDRM], [libdrm])
AC_SUBST(LIBDRM_CFLAGS)
fi
AC_DEFINE(XINPUT,1,[Support X Input extension])
EXTENSION_LIBS="$EXTENSION_LIBS "'$(top_builddir)/Xi/libXi.la'
@ -803,9 +804,9 @@ hw/xfree86/int10/Makefile
hw/xfree86/loader/Makefile
hw/xfree86/os-support/Makefile
hw/xfree86/os-support/bus/Makefile
hw/xfree86/os-support/drm/Makefile
hw/xfree86/os-support/misc/Makefile
hw/xfree86/os-support/linux/Makefile
hw/xfree86/os-support/linux/drm/Makefile
hw/xfree86/os-support/solaris/Makefile
hw/xfree86/parser/Makefile
hw/xfree86/rac/Makefile

2
hw/dmx/Makefile.am
View File

@ -31,8 +31,8 @@ Xdmx_SOURCES = dmxinit.c \
dmxsync.c \
dmxextension.c \
dmxpict.c \
dmx.c \
$(top_srcdir)/fb/fbcmap.c \
$(top_srcdir)/Xext/dmx.c \
$(top_srcdir)/mi/miinitext.c \
$(GLX_SRCS)

9
hw/xfree86/dri/Makefile.am
View File

@ -1,5 +1,12 @@
libdri_la_LTLIBRARIES = libdri.la
libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/GL/glx/ -I$(top_srcdir)/GL/include -DXF86DRI -DXORG_VERSION_CURRENT=\"100\" @DRIPROTO_CFLAGS@
libdri_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
-I$(top_srcdir)/hw/xfree86/os-support \
-I$(top_srcdir)/hw/xfree86/os-support/bus \
-I$(top_srcdir)/GL/glx \
-I$(top_srcdir)/GL/include \
-DHAVE_XORG_CONFIG_H \
@DRIPROTO_CFLAGS@ \
@LIBDRM_CFLAGS@
libdri_la_LDFLAGS = -module -avoid-version
libdri_ladir = @moduledir@/extensions
libdri_la_SOURCES = \

6
hw/xfree86/os-support/Makefile.am
View File

@ -1,4 +1,8 @@
SUBDIRS = bus @XORG_OS_SUBDIR@ misc
if DRI
DRI_SUBDIRS=drm
endif
SUBDIRS = bus @XORG_OS_SUBDIR@ misc $(DRI_SUBDIRS)
sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h xf86drm.h \
xf86drmCompat.h assyntax.h xf86OSKbd.h xf86OSmouse.h

18
hw/xfree86/os-support/drm/Makefile.am Normal file
View File

@ -0,0 +1,18 @@
libdrm_la_LTLIBRARIES = libdrm.la
libdrm_la_CFLAGS = -I$(top_srcdir)/hw/xfree86/common \
-I$(top_srcdir)/hw/xfree86/dri \
-I$(top_srcdir)/hw/xfree86/os-support \
-I$(top_srcdir)/hw/xfree86/os-support/bus \
-I$(top_srcdir)/hw/xfree86/os-suport/shared/drm/kernel \
-I$(top_srcdir)/GL/glx \
-I$(top_srcdir)/GL/include \
-DHAVE_XORG_CONFIG_H \
@LIBDRM_CFLAGS@
libdrm_la_LDFLAGS = -module -avoid-version
libdrm_ladir = @moduledir@/@XORG_OS@
libdrm_la_SOURCES = \
xf86drm.c \
xf86drmHash.c \
xf86drmRandom.c \
xf86drmSL.c \
drmmodule.c

7
hw/xfree86/os-support/linux/Makefile.am
View File

@ -1,8 +1,3 @@
if DRI
DRI_SUBDIRS=drm
DRI_LIBS=drm/libxorglinuxdrm.a
endif
noinst_LIBRARIES = liblinux.a
liblinux_a_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \
lnx_pci.c lnx_agp.c lnx_kmod.c lnx_KbdMap.c \
@ -20,8 +15,6 @@ sdk_HEADERS = agpgart.h
AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC $(XORG_CFLAGS)
SUBDIRS = $(DRI_SUBDIRS)
INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack
EXTRA_DIST = \

12
hw/xfree86/os-support/linux/drm/Makefile.am
View File

@ -1,12 +0,0 @@
INCLUDES = -I$(srcdir)/../../shared/drm/kernel \
-I$(srcdir)/../.. \
-I$(srcdir)/../../bus \
-I$(srcdir)/../../../dri \
-I$(srcdir)/../../../common
sdklibdir = $(libdir)/xorg
sdklib_LIBRARIES = libxorglinuxdrm.a
libxorglinuxdrm_a_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c \
xf86drmSL.c drmmodule.c
AM_CFLAGS = $(XORG_CFLAGS)

2
hw/xfree86/xf4bpp/Makefile.am
View File

@ -55,7 +55,7 @@ DISTCLEANFILES = mfbseg.c
mfbseg.c:
echo "#define POLYSEGMENT" > $@
echo "#include \"$(top_srcdir)/mfb/mfbline.c\"" >> $@
echo "#include \"$(srcdir)/mfbline.c\"" >> $@
INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb -I$(top_srcdir)/cfb

10
include/dix-config.h.in
View File

@ -1,4 +1,7 @@
/* include/config.h.in. Generated from configure.ac by autoheader. */
/* dix-config.h.in: not at all generated. -*- c -*- */
#ifndef _DIX_CONFIG_H_
#define _DIX_CONFIG_H_
/* Support BigRequests extension */
#undef BIGREQS
@ -342,6 +345,9 @@
/* Support Xv Extension */
#undef XV
/* Support DRI support */
#undef XF86DRI
/* Vendor name */
#undef XVENDORNAME
@ -365,3 +371,5 @@
/* Build Rootless code */
#undef ROOTLESS
#endif /* _DIX_CONFIG_H_ */

8
include/xkb-config.h.in
View File

@ -1,10 +1,14 @@
/*
* xkb-config.h.in: not at all generated.
/* xkb-config.h.in: not at all generated. -*- c -*-
*
*/
#ifndef _XKB_CONFIG_H_
#define _XKB_CONFIG_H_
/* Default set of XKB rules. */
#undef __XKBDEFRULES__
/* Path to XKB definitions. */
#undef XKB_BASE_DIRECTORY
#endif /* _XKB_CONFIG_H_ */

20
include/xorg-config.h.in
View File

@ -1,14 +1,14 @@
/*
* xorg-config.h.in: not at all generated.
/* xorg-config.h.in: not at all generated. -*- c -*-
*
* This file differs from xorg-server.h.in in that -server is installed with the
* rest of the SDK for external drivers/modules to use, whereas -config is for
* internal use only (i.e. building the DDX).
* This file differs from xorg-server.h.in in that -server is installed
* with the rest of the SDK for external drivers/modules to use, whereas
* -config is for internal use only (i.e. building the DDX).
*
*/
/* Normally these are guarded, but if we don't have dix-config.h, we're in some
* pretty serious trouble anyway. Consider this a canary. */
#ifndef _XORG_CONFIG_H_
#define _XORG_CONFIG_H_
#include <dix-config.h>
#include <xkb-config.h>
@ -61,11 +61,9 @@
#undef DEFAULT_LOGPREFIX
/* Building DRI-capable DDX. */
#undef XORGDRI
/* Building DRI-capable DDX. */
#undef _XORGDRI_SERVER_
#undef XF86DRI
/* Solaris 8 or later? */
#undef __SOL8__
#endif /* _XORG_CONFIG_H_ */

10
include/xorg-server.h.in
View File

@ -13,6 +13,9 @@
* However, it should be kept in sync with this file.
*/
#ifndef _XORG_SERVER_H_
#define _XORG_SERVER_H_
/* Support BigRequests extension */
#undef BIGREQS
@ -161,7 +164,7 @@
#undef XLOADABLE
/* Build DRI extension */
#undef XORGDRI
#undef XF86DRI
/* Build Xorg server */
#undef XORGSERVER
@ -202,9 +205,6 @@
/* X/Open-compliant source */
#undef _XOPEN_SOURCE
/* XORGDRI internal define */
#undef _XORGDRI_SERVER_
/* Vendor web address for support */
#undef __VENDORDWEBSUPPORT__
@ -216,3 +216,5 @@
/* Name of X server */
#undef __XSERVERNAME__
#endif /* _XORG_SERVER_H_ */