Attachment #73606 for bug #101674

Lines 7-13 Link Here

(-)linuxwacom-0.7.1.orig/src/Makefile.am (-1 / +1 lines)
7	wacomcfgdir = $(includedir)/wacomcfg	7	wacomcfgdir = $(includedir)/wacomcfg
8	wacomcfg_HEADERS = wacomcfg.h	8	wacomcfg_HEADERS = wacomcfg.h
9		9
10	x86moduledir = @WCM_XLIBDIR@/modules/input	10	x86moduledir = @WCM_XLIBDIR@/xorg/modules/input
11	x86module_DATA = @WCM_XF86MODULES@	11	x86module_DATA = @WCM_XF86MODULES@
12		12
13	AM_CFLAGS = -Wall -pedantic	13	AM_CFLAGS = -Wall -pedantic

Lines 130-136 Link Here

(-)linuxwacom-0.7.1.orig/src/Makefile.in (-1 / +1 lines)
130	wacomcfgdir = $(includedir)/wacomcfg	130	wacomcfgdir = $(includedir)/wacomcfg
131	wacomcfg_HEADERS = wacomcfg.h	131	wacomcfg_HEADERS = wacomcfg.h
132		132
133	x86moduledir = @WCM_XLIBDIR@/modules/input	133	x86moduledir = @WCM_XLIBDIR@/xorg/modules/input
134	x86module_DATA = @WCM_XF86MODULES@	134	x86module_DATA = @WCM_XF86MODULES@
135		135
136	AM_CFLAGS = -Wall -pedantic	136	AM_CFLAGS = -Wall -pedantic





/****************************************************************************/

#include <xorg/xf86Version.h>
#include <Xwacom.h>

/*****************************************************************************

#include <errno.h>
#endif

#include <xorg/misc.h>
#include <xorg/xf86.h>
#define NEED_XF86_TYPES
#if !defined(DGUX)
#include <xorg/xf86_ansic.h>
#include <xorg/xisb.h>
#endif
#include <xorg/xf86_OSproc.h>
#include <xorg/xf86Xinput.h>
#include <xorg/exevents.h>           /* Needed for InitValuator/Proximity stuff */
#include <X11/keysym.h>
#include <xorg/mipointer.h>

#ifdef XFree86LOADER
#include <xorg/xf86Module.h>
#endif

/*****************************************************************************

Return to bug 101674

Lines 27-33 Link Here

(-)linuxwacom-0.7.1.orig/src/xf86Wacom.h (-11 / +11 lines)
27		27
28	/****************************************************************************/	28	/****************************************************************************/
29		29
30	#include <xf86Version.h>	30	#include <xorg/xf86Version.h>
31	#include <Xwacom.h>	31	#include <Xwacom.h>
32		32
33	/*****************************************************************************	33	/*****************************************************************************
Lines 69-89 Link Here
69	#include <errno.h>	69	#include <errno.h>
70	#endif	70	#endif
71		71
72	#include <misc.h>	72	#include <xorg/misc.h>
73	#include <xf86.h>	73	#include <xorg/xf86.h>
74	#define NEED_XF86_TYPES	74	#define NEED_XF86_TYPES
75	#if !defined(DGUX)	75	#if !defined(DGUX)
76	#include <xf86_ansic.h>	76	#include <xorg/xf86_ansic.h>
77	#include <xisb.h>	77	#include <xorg/xisb.h>
78	#endif	78	#endif
79	#include <xf86_OSproc.h>	79	#include <xorg/xf86_OSproc.h>
80	#include <xf86Xinput.h>	80	#include <xorg/xf86Xinput.h>
81	#include <exevents.h> /* Needed for InitValuator/Proximity stuff */	81	#include <xorg/exevents.h> /* Needed for InitValuator/Proximity stuff */
82	#include <keysym.h>	82	#include <X11/keysym.h>
83	#include <mipointer.h>	83	#include <xorg/mipointer.h>
84		84
85	#ifdef XFree86LOADER	85	#ifdef XFree86LOADER
86	#include <xf86Module.h>	86	#include <xorg/xf86Module.h>
87	#endif	87	#endif
88		88
89	/*****************************************************************************	89	/*****************************************************************************