SwallowOS/xserver_xsdl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the *-config.h includes so that it is possible to build modules without

Browse Source 
having to use -include in the Makefile.
This commit is contained in:
Kevin E Martin
2005-07-16 03:49:59 +00:00
parent 0635acab08
commit 5f81eb1d89
19 changed files with 44 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hw/xfree86/dixmods/GLcoremodule.c
View File

@@ -32,8 +32,8 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <dix-config.h> #include <xorg-config.h>
#endif #endif
#include "xf86Module.h" #include "xf86Module.h"

4
hw/xfree86/dixmods/afbmodule.c
View File

@@ -29,10 +29,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifdef XFree86LOADER #ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"

4
hw/xfree86/dixmods/dbemodule.c
View File

@@ -4,10 +4,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#include "xf86Module.h" #include "xf86Module.h"
static MODULESETUPPROTO(dbeSetup); static MODULESETUPPROTO(dbeSetup);

4
hw/xfree86/dixmods/extmod/modinit.c
View File

@@ -23,8 +23,8 @@
* PERFORMANCE OF THIS SOFTWARE. * PERFORMANCE OF THIS SOFTWARE.
*/ */
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <dix-config.h> #include <xorg-config.h>
#endif #endif
#ifdef XFree86LOADER #ifdef XFree86LOADER

8
hw/xfree86/dixmods/extmod/xf86dga.c
View File

@@ -7,12 +7,12 @@ Copyright (c) 1995, 1996, 1999 XFree86 Inc
*/ */
#define NEED_REPLIES #ifdef HAVE_XORG_CONFIG_H
#define NEED_EVENTS #include <xorg-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif #endif
#define NEED_REPLIES
#define NEED_EVENTS
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "misc.h" #include "misc.h"

8
hw/xfree86/dixmods/extmod/xf86dga2.c
View File

@@ -6,12 +6,12 @@
/* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.17 2001/10/28 03:32:51 tsi Exp $ */ /* $XFree86: xc/programs/Xserver/Xext/xf86dga2.c,v 1.17 2001/10/28 03:32:51 tsi Exp $ */
#define NEED_REPLIES #ifdef HAVE_XORG_CONFIG_H
#define NEED_EVENTS #include <xorg-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif #endif
#define NEED_REPLIES
#define NEED_EVENTS
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "misc.h" #include "misc.h"

8
hw/xfree86/dixmods/extmod/xf86misc.c
View File

@@ -6,12 +6,12 @@
/* THIS IS NOT AN X CONSORTIUM STANDARD */ /* THIS IS NOT AN X CONSORTIUM STANDARD */
#define NEED_REPLIES #ifdef HAVE_XORG_CONFIG_H
#define NEED_EVENTS #include <xorg-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif #endif
#define NEED_REPLIES
#define NEED_EVENTS
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "misc.h" #include "misc.h"

8
hw/xfree86/dixmods/extmod/xf86vmode.c
View File

@@ -33,12 +33,12 @@ from Kaleb S. KEITHLEY
/* $Xorg: xf86vmode.c,v 1.3 2000/08/17 19:47:59 cpqbld Exp $ */ /* $Xorg: xf86vmode.c,v 1.3 2000/08/17 19:47:59 cpqbld Exp $ */
/* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */ /* THIS IS NOT AN X CONSORTIUM STANDARD OR AN X PROJECT TEAM SPECIFICATION */
#define NEED_REPLIES #ifdef HAVE_XORG_CONFIG_H
#define NEED_EVENTS #include <xorg-config.h>
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif #endif
#define NEED_REPLIES
#define NEED_EVENTS
#include <X11/X.h> #include <X11/X.h>
#include <X11/Xproto.h> #include <X11/Xproto.h>
#include "misc.h" #include "misc.h"

4
hw/xfree86/dixmods/extmod/xvmod.c
View File

@@ -1,7 +1,7 @@
/* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.1 1998/08/13 14:45:36 dawes Exp $ */ /* $XFree86: xc/programs/Xserver/Xext/xvmod.c,v 1.1 1998/08/13 14:45:36 dawes Exp $ */
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <dix-config.h> #include <xorg-config.h>
#endif #endif
#include <X11/X.h> #include <X11/X.h>

4
hw/xfree86/dixmods/fbmodule.c
View File

@@ -29,10 +29,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifdef XFree86LOADER #ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"

4
hw/xfree86/dixmods/glxmodule.c
View File

@@ -33,6 +33,10 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
* *
*/ */
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include "xf86Module.h" #include "xf86Module.h"
#include "colormap.h" #include "colormap.h"
#include "micmap.h" #include "micmap.h"

4
hw/xfree86/dixmods/laymodule.c
View File

@@ -26,10 +26,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifdef XFree86LOADER #ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"

4
hw/xfree86/dixmods/mfbmodule.c
View File

@@ -29,10 +29,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifdef XFree86LOADER #ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"

4
hw/xfree86/dixmods/recordmod.c
View File

@@ -1,7 +1,7 @@
/* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.5 1999/01/26 05:54:21 dawes Exp $ */ /* $XFree86: xc/programs/Xserver/record/recordmod.c,v 1.5 1999/01/26 05:54:21 dawes Exp $ */
#ifdef HAVE_DIX_CONFIG_H #ifdef HAVE_XORG_CONFIG_H
#include <dix-config.h> #include <xorg-config.h>
#endif #endif
#include "xf86Module.h" #include "xf86Module.h"

4
hw/xfree86/dixmods/shmodule.c
View File

@@ -26,10 +26,6 @@
#include <xorg-config.h> #include <xorg-config.h>
#endif #endif
#ifdef HAVE_DIX_CONFIG_H
#include <dix-config.h>
#endif
#ifdef XFree86LOADER #ifdef XFree86LOADER
#include "xf86Module.h" #include "xf86Module.h"

4
mi/miinitext.c
View File

@@ -52,6 +52,10 @@ SOFTWARE.
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#ifdef HAVE_DMX_CONFIG_H #ifdef HAVE_DMX_CONFIG_H
#include <dmx-config.h> #include <dmx-config.h>
#endif #endif

4
xkb/ddxKillSrv.c
View File

@@ -30,6 +30,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <stdio.h> #include <stdio.h>
#define NEED_EVENTS 1 #define NEED_EVENTS 1
#include <X11/X.h> #include <X11/X.h>

4
xkb/ddxPrivate.c
View File

@@ -4,6 +4,10 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <stdio.h> #include <stdio.h>
#define NEED_EVENTS 1 #define NEED_EVENTS 1
#include <X11/X.h> #include <X11/X.h>

4
xkb/ddxVT.c
View File

@@ -30,6 +30,10 @@ THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#ifdef HAVE_XORG_CONFIG_H
#include <xorg-config.h>
#endif
#include <stdio.h> #include <stdio.h>
#define NEED_EVENTS 1 #define NEED_EVENTS 1
#include <X11/X.h> #include <X11/X.h>