[xserver-commit] xfree86/fbdevhw Makefile.am,1.1,1.2 fbdevhw.c,1.34,1.35 fbdevhwstub.c,1.14,1.15

[Keith Packard]

Committed by: keithp

Update of /cvs/xserver/xfree86/fbdevhw
In directory pdx:/tmp/cvs-serv14744/fbdevhw

Modified Files:
	Makefile.am fbdevhw.c fbdevhwstub.c 
Log Message:
	* Makefile.am
	* *.c
	Ok, everyone gets #include <config.h>
	Other than that, I fixed a few extension header paths and
	whacked at the Makefile.am.  Makefile.am is a hacked version
	of xserver/Makefile.am; expect them to diverge until we can
	stick the xfree86 DDX stuff into the standard Makefile.am.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/xfree86/fbdevhw/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- a/Makefile.am	19 Feb 2004 03:50:05 -0000	1.1
+++ b/Makefile.am	28 Feb 2004 01:27:51 -0000	1.2
@@ -1,9 +1,9 @@
-lib_LIBRARIES = libxf86fbdev.a
+lib_LIBRARIES = libxf86fbdevhw.a
 
 #if FBDEVHW
-libxf86fbdev_a_SOURCES = fbdevhw.c
+libxf86fbdevhw_a_SOURCES = fbdevhw.c
 #else
-#libxf86fbdev_a_SOURCES = fbdevhwstub.c
+#libxf86fbdevhw_a_SOURCES = fbdevhwstub.c
 #endif
 
 INCLUDES = $(XF86_INCS) -I$(srcdir)/../i2c -I$(top_srcdir)/Xext \

Index: fbdevhw.c
===================================================================
RCS file: /cvs/xserver/xfree86/fbdevhw/fbdevhw.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- a/fbdevhw.c	19 Feb 2004 03:51:37 -0000	1.34
+++ b/fbdevhw.c	28 Feb 2004 01:27:51 -0000	1.35
@@ -1,6 +1,9 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c,v 1.33 2003/10/30 17:37:16 tsi Exp $ */
 
 /* all driver need this */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86_OSproc.h"
 #include "xf86_ansic.h"

Index: fbdevhwstub.c
===================================================================
RCS file: /cvs/xserver/xfree86/fbdevhw/fbdevhwstub.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- a/fbdevhwstub.c	19 Feb 2004 03:51:37 -0000	1.14
+++ b/fbdevhwstub.c	28 Feb 2004 01:27:51 -0000	1.15
@@ -1,5 +1,8 @@
 /* $XFree86: xc/programs/Xserver/hw/xfree86/fbdevhw/fbdevhwstub.c,v 1.13 2003/10/30 17:37:16 tsi Exp $ */
 
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include "xf86.h"
 #include "xf86cmap.h"
 #include "fbdevhw.h"