frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kdrive: Drop kdrive-config.h. 

It had nothing left in it that was used but wasn't in dix-config.h.

Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Daniel Stone <daniels@collabora.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Eric Anholt 2017-03-22 15:11:32 -07:00 committed by Adam Jackson
parent 5c7ed785e3
commit 190c2adf4a
19 changed files with 33 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
configure.ac
View File

@ -67,8 +67,6 @@ dnl xkb-config.h covers XKB for the Xorg and Xnest DDXs.
AC_CONFIG_HEADERS(include/xkb-config.h) AC_CONFIG_HEADERS(include/xkb-config.h)
dnl xwin-config.h covers the XWin DDX. dnl xwin-config.h covers the XWin DDX.
AC_CONFIG_HEADERS(include/xwin-config.h) AC_CONFIG_HEADERS(include/xwin-config.h)
dnl kdrive-config.h covers the kdrive DDX
AC_CONFIG_HEADERS(include/kdrive-config.h)
dnl version-config.h covers the version numbers so they can be bumped without dnl version-config.h covers the version numbers so they can be bumped without
dnl forcing an entire recompile.x dnl forcing an entire recompile.x
AC_CONFIG_HEADERS(include/version-config.h) AC_CONFIG_HEADERS(include/version-config.h)
@ -2369,9 +2367,6 @@ XEPHYR_INCS=
AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes]) AM_CONDITIONAL(KDRIVE, [test x$KDRIVE = xyes])
if test "$KDRIVE" = yes; then if test "$KDRIVE" = yes; then
AC_DEFINE(KDRIVESERVER,1,[Build Kdrive X server])
AC_DEFINE(KDRIVEDDXACTIONS,,[Build kdrive ddx])
XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm xcb-keysyms xcb-randr xcb-xkb" XEPHYR_REQUIRED_LIBS="xau xdmcp xcb xcb-shape xcb-render xcb-renderutil xcb-aux xcb-image xcb-icccm xcb-shm xcb-keysyms xcb-randr xcb-xkb"
if test "x$XV" = xyes; then if test "x$XV" = xyes; then
XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xcb-xv" XEPHYR_REQUIRED_LIBS="$XEPHYR_REQUIRED_LIBS xcb-xv"
@ -2399,7 +2394,7 @@ if test "$KDRIVE" = yes; then
KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux' KDRIVE_OS_INC='-I$(top_srcdir)/hw/kdrive/linux'
KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC" KDRIVE_INCS="$KDRIVE_PURE_INCS $KDRIVE_OS_INC"
KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H" KDRIVE_CFLAGS="$XSERVER_CFLAGS"
KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB" KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $DRI3_LIB $PRESENT_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la' KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'

1
hw/kdrive/ephyr/Makefile.am
View File

@ -26,6 +26,7 @@ AM_CPPFLAGS = \
@KDRIVE_CFLAGS@ \ @KDRIVE_CFLAGS@ \
@XEPHYR_INCS@ \ @XEPHYR_INCS@ \
@XEPHYR_CFLAGS@ \ @XEPHYR_CFLAGS@ \
-DHAVE_DIX_CONFIG_H \
-I$(top_srcdir) \ -I$(top_srcdir) \
-I$(top_srcdir)/glamor \ -I$(top_srcdir)/glamor \
-I$(top_srcdir)/exa -I$(top_srcdir)/exa

4
hw/kdrive/ephyr/ephyr.c
View File

@ -23,8 +23,8 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <kdrive-config.h> #include <dix-config.h>
#endif #endif
#include <xcb/xcb_keysyms.h> #include <xcb/xcb_keysyms.h>

4
hw/kdrive/ephyr/ephyr_draw.c
View File

@ -25,8 +25,8 @@
* *
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <kdrive-config.h> #include <dix-config.h>
#endif #endif
#include "ephyr.h" #include "ephyr.h"

4
hw/kdrive/ephyr/ephyr_glamor_xv.c
View File

@ -21,8 +21,8 @@
* IN THE SOFTWARE. * IN THE SOFTWARE.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <kdrive-config.h> #include <dix-config.h>
#endif #endif
#include "kdrive.h" #include "kdrive.h"

4
hw/kdrive/ephyr/ephyrcursor.c
View File

@ -24,8 +24,8 @@
* Adam Jackson <ajax@redhat.com> * Adam Jackson <ajax@redhat.com>
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <kdrive-config.h> #include <dix-config.h>
#endif #endif
#include "ephyr.h" #include "ephyr.h"
#include "ephyrlog.h" #include "ephyrlog.h"

4
hw/kdrive/ephyr/ephyrinit.c
View File

@ -23,8 +23,8 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <kdrive-config.h> #include <dix-config.h>
#endif #endif
#include "ephyr.h" #include "ephyr.h"
#include "ephyrlog.h" #include "ephyrlog.h"

4
hw/kdrive/ephyr/ephyrvideo.c
View File

@ -26,8 +26,8 @@
* Dodji Seketeli <dodji@openedhand.com> * Dodji Seketeli <dodji@openedhand.com>
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <kdrive-config.h> #include <dix-config.h>
#endif #endif
#include <string.h> #include <string.h>
#include <X11/extensions/Xv.h> #include <X11/extensions/Xv.h>

4
hw/kdrive/ephyr/hostx.c
View File

@ -23,8 +23,8 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <kdrive-config.h> #include <dix-config.h>
#endif #endif
#include "hostx.h" #include "hostx.h"

4
hw/kdrive/ephyr/os.c
View File

@ -23,8 +23,8 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <kdrive-config.h> #include <dix-config.h>
#endif #endif
#include "ephyr.h" #include "ephyr.h"

4
hw/kdrive/src/kcmap.c
View File

@ -20,8 +20,8 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <kdrive-config.h> #include <dix-config.h>
#endif #endif
#include "kdrive.h" #include "kdrive.h"

4
hw/kdrive/src/kdrive.c
View File

@ -20,8 +20,8 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <kdrive-config.h> #include <dix-config.h>
#endif #endif
#include "kdrive.h" #include "kdrive.h"
#include <mivalidate.h> #include <mivalidate.h>

4
hw/kdrive/src/kinfo.c
View File

@ -20,8 +20,8 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <kdrive-config.h> #include <dix-config.h>
#endif #endif
#include "kdrive.h" #include "kdrive.h"

5
hw/kdrive/src/kinput.c
View File

@ -21,8 +21,9 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <kdrive-config.h> #include <dix-config.h>
#include <xkb-config.h>
#endif #endif
#include "kdrive.h" #include "kdrive.h"
#include "inputstr.h" #include "inputstr.h"

4
hw/kdrive/src/kmode.c
View File

@ -21,8 +21,8 @@
* Author: Keith Packard, SuSE, Inc. * Author: Keith Packard, SuSE, Inc.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <kdrive-config.h> #include <dix-config.h>
#endif #endif
#include "kdrive.h" #include "kdrive.h"

4
hw/kdrive/src/kshadow.c
View File

@ -20,8 +20,8 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <kdrive-config.h> #include <dix-config.h>
#endif #endif
#include "kdrive.h" #include "kdrive.h"

4
hw/kdrive/src/kxv.c
View File

@ -35,8 +35,8 @@ of the copyright holder.
*/ */
#ifdef HAVE_CONFIG_H #ifdef HAVE_DIX_CONFIG_H
#include <kdrive-config.h> #include <dix-config.h>
#endif #endif
#include "kdrive.h" #include "kdrive.h"

25
include/kdrive-config.h.in
View File

@ -1,25 +0,0 @@
/* kdrive-config.h.in: not at all generated. -*- c -*-
*/
#ifndef _KDRIVE_CONFIG_H_
#define _KDRIVE_CONFIG_H_
#include <dix-config.h>
#include <xkb-config.h>
/* Building kdrive server. */
#undef KDRIVESERVER
/* Include framebuffer support in X servers */
#undef KDRIVEFBDEV
/* Verbose debugging output hilarity */
#undef DEBUG
/* Have the backtrace() function. */
#undef HAVE_BACKTRACE
/* Have execinfo.h for backtrace(). */
#undef HAVE_EXECINFO_H
#endif /* _KDRIVE_CONFIG_H_ */

4
mi/miinitext.c
View File

@ -97,10 +97,6 @@ SOFTWARE.
#undef DPMSExtension #undef DPMSExtension
#endif #endif
#ifdef HAVE_KDRIVE_CONFIG_H
#include <kdrive-config.h>
#endif
#ifdef HAVE_XGL_CONFIG_H #ifdef HAVE_XGL_CONFIG_H
#include <xgl-config.h> #include <xgl-config.h>
#endif #endif