debrix/hw/xorg Makefile.am,1.4,1.5

[Daniel Stone]

Committed by: daniel

Update of /cvs/xserver/debrix/hw/xorg
In directory pdx:/tmp/cvs-serv31934/hw/xorg

Modified Files:
	Makefile.am 
Log Message:
2004-06-29  Daniel Stone  <daniel at freedesktop.org>

	* configure.ac:
	Made CFLAGS a little less embarassingly large; fix it so the script
	actually runs and works fine (no more sed errors); remove XF86keysym.h
	check, which probably never actually worked. Get rid of INCLUDES;
	merge it into CFLAGS.

	* */Makefile.am:
	Sanitise INCLUDES/CFLAGS usage to radically decrease length of gcc
	lines.

	* include/Makefile.am:
	Make debrix.h depend on config.h, so they stay in sync. Oops.

	* hw/xorg/int10/xf86int10module.c:
	Change int10VersRec declaration from static, so debrixInit can see it.

	* hw/xorg/common/xf86KbdLnx.c:
	* hw/xorg/os-support/linux/lnx_KbdMap.c:
	Axe unused DECkeysym.h header dep.

	* hw/xorg/include/X11/extensions/Makefile.am:
	Finally fix the ext_HEADERS debacle.

	* hw/xorg/loader/dlloader.c:
	* hw/xorg/loader/loader.c:
	dlopen() NULL at startup, and include it in dlsym() searches, so we
	can find symbols included in the main binary with the standard module
	search.

	* hw/xorg/loader/loader.c:
	* hw/xorg/loader/loadmod.c:
	* hw/xorg/loader/xf86sym.c:
	* hw/xorg/common/xf86Init.c:
	Change loader API to introduce a new 'builtin' class, which doesn't
	actually load a module, but goes through all the motions; get rid of
	baseModules list for the time being (we don't want bitmap, and pcidata
	is already loaded). Explicitly add all ModuleData objects being loaded
	to xf86sym.c, so they don't get 'optimised' out.
	
	* hw/xorg/common/debrixInit.c:
	* hw/xorg/common/xf86Init.c:
	Add new debrixInit() function, which adds a few modules as builtins.

	* hw/xorg/loader/xf86sym.c:
	* hw/xorg/os-support/linux/Makefile.am:
	Re-enable a few missing os-support functions (xf86UDelay, xf86IODelay,
	xf86BusToMem, xf86MemToBus, xf86LoadKernelModule).

	* configure.ac:
	* fb/Makefile.am:
	* miext/shadow/Makefile.am:
	Make fb and shadow modular once more.

	* fb/fb.h:
	* render/filter.c:
	* render/picture.c:
	* include/picturestr.h:
	Rolled back to X.Org versions until I can figure out why pictures
	don't actually display in most cases.

	The following two are thanks to Jabuk Piotr C?apa.
	* os/xdmauth.c:
	"Xdmcp.h" -> <X11/Xdmcp.h>

	* hw/xorg/os-support/shared/drm/kernel/drm.h:
	Guard linux/config.h inclusion with #ifdef __KERNEL__.


Index: Makefile.am
===================================================================
RCS file: /cvs/xserver/debrix/hw/xorg/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	28 Jun 2004 02:43:39 -0000	1.4
+++ Makefile.am	1 Jul 2004 17:49:48 -0000	1.5
@@ -1,6 +1,6 @@
 SUBDIRS = common ddc dummylib i2c int10 fbdevhw os-support parser rac \
           ramdac shadowfb vbe vgahw xaa xf4bpp xf1bpp xf8_16bpp xf8_32bpp \
-	  xf8_32wid loader scanpci include
+          xf8_32wid loader scanpci include
 
 bin_PROGRAMS = Xorg
 
@@ -27,21 +27,21 @@
             fbdevhw/libfbdevhw.a \
             rac/librac.a \
             ramdac/libramdac.a \
-            scanpci/libpcidata.a \
             scanpci/libscanpci.a \
+            shadowfb/libshadowfb.a \
             vbe/libvbe.a \
             vgahw/libvgahw.a \
             xaa/libxaa.a \
+            xf8_16bpp/libxf8_16bpp.a \
+            xf8_32bpp/libxf8_32bpp.a \
+            xf8_32wid/libxf8_32wid.a \
             xf4bpp/libxf4bpp.a \
             xf1bpp/libxf1bpp.a \
-	    xf8_16bpp/libxf8_16bpp.a \
-	    xf8_32bpp/libxf8_32bpp.a \
-	    xf8_32wid/libxf8_32wid.a \
             $(OS_LIBS) \
             dummylib/libdummy.a \
             @XORG_LIBS@
 
-INCLUDES = $(XORG_INCS) -I$(srcdir)/loader -I$(srcdir)/ddc -I$(srcdir)/i2c
+INCLUDES = -I$(srcdir)/loader -I$(srcdir)/ddc -I$(srcdir)/i2c
 
 Xorg_LDADD = $(XORG_LIBS) \
              @XSERVER_LIBS@ \