Adding initial build system.

32 files changed, 858 insertions, 0 deletions

diff --git a/hw/Makefile.am b/hw/Makefile.am
new file mode 100644
index 000000000..26343e56b
--- /dev/null
+++ b/hw/Makefile.am
@@ -0,0 +1,9 @@
+if DMX
+DMX_SUBDIRS = dmx
+endif
+
+XORG_SUBDIRS = xfree86 
+
+SUBDIRS =			\
+	$(XORG_SUBDIRS)		\
+	$(DMX_SUBDIRS)
diff --git a/hw/dmx/Makefile.am b/hw/dmx/Makefile.am
new file mode 100644
index 000000000..b387a9ffe
--- /dev/null
+++ b/hw/dmx/Makefile.am
@@ -0,0 +1,84 @@
+SUBDIRS = input
+bin_PROGRAMS = Xdmx
+
+if XINERAMA
+PANORAMIX_SRCS = $(top_srcdir)/Xext/panoramiX.c
+endif
+
+if GLX
+SUBDIRS += glxProxy
+GLX_LIBS = glxProxy/libglxproxy.a
+GLX_SRCS = $(PANORAMIX_SRCS) dmx_glxvisuals.c
+endif
+
+Xdmx_SOURCES = dmxinit.c \
+	dmxscrinit.c \
+	dmxshadow.c \
+	dmxcursor.c \
+	dmxinput.c \
+	dmxdpms.c \
+	dmxgc.c \
+	dmxgcops.c \
+	dmxwindow.c \
+	dmxpixmap.c \
+	dmxfont.c \
+	dmxcmap.c \
+	dmxvisual.c \
+	dmxlog.c \
+	dmxcb.c \
+	dmxprop.c \
+	dmxstat.c \
+	dmxsync.c \
+	dmxextension.c \
+	miinitext.c \
+	dmxpict.c \
+	libc_wrapper.c \
+	$(GLX_SRCS) 
+
+
+
+#if COMPOSITE
+#Xdmx_SOURCES += fakecw.c
+#endif
+
+miinitext.c: 
+	echo "#include <config.h>" > $@
+	echo "#undef HAVE_CONFIG_H" >> $@
+	echo "#define DMXEXT" >> $@
+	echo "#undef BEZIER " >> $@
+	echo "#undef PEXEXT " >> $@ 
+	echo "#undef MULTIBUFFER  " >> $@
+	echo "#undef XV  " >> $@
+	echo "#undef XIE " >> $@ 
+	echo "#undef DBE " >> $@ 
+	echo "#undef XF86VIDMODE  " >> $@
+	echo "#undef XF86MISC  " >> $@
+	echo "#undef XFreeXDGA " >> $@ 
+	echo "#undef XF86DRI  " >> $@
+	echo "#undef MITSHM  " >> $@
+	echo "#undef TOGCUP  " >> $@
+	echo "#undef DPSEXT  " >> $@
+	echo "#undef MITMISC " >> $@ 
+	echo "#undef SCREENSAVER  " >> $@
+	echo "#undef RANDR  " >> $@
+	echo "#undef XFIXES " >> $@ 
+	echo "#undef DAMAGE " >> $@
+	echo "#undef COMPOSITE " >> $@
+	echo "#undef FONTCACHE " >> $@
+	echo "#undef XFree86LOADER " >> $@
+	echo "#include \"$(top_srcdir)/mi/miinitext.c\"" >> $@
+
+DISTCLEANFILES = miinitext.c libc_wrapper.c
+
+libc_wrapper.c:
+	echo "#define SELF_CONTAINED_WRAPPER" > $@
+	echo "#include \"$(top_srcdir)/hw/xorg/os-support/shared/libc_wrapper.c\"" >> $@
+	
+
+Xdmx_LDFLAGS = -rdynamic
+Xdmx_LDADD = $(XORG_CORE_LIBS) $(top_srcdir)/hw/xorg/os-support/@XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.a  \
+	$(XDMX_LIBS) $(GLX_LIBS) $(top_srcdir)/miext/shadow/.libs/libshadow.a $(top_srcdir)/fb/.libs/libfb.a  \
+	$(top_srcdir)/hw/xorg/dummylib/libdummy.a  input/libdmxinput.a \
+	config/libdmxconfig.a -lfl $(XDMCP_LIBS) @DMXMODULES_LIBS@  -lXi
+
+Xdmx_CFLAGS = @DMXMODULES_CFLAGS@
diff --git a/hw/dmx/glxProxy/Makefile.am b/hw/dmx/glxProxy/Makefile.am
new file mode 100644
index 000000000..65735ea3a
--- /dev/null
+++ b/hw/dmx/glxProxy/Makefile.am
@@ -0,0 +1,7 @@
+noinst_LIBRARIES = libglxproxy.a
+libglxproxy_a_SOURCES =  g_disptab.c glxcmds.c glxext.c glxutil.c g_renderswap.c \
+                render2swap.c renderpixswap.c global.c glxcmdsswap.c \
+		compsize.c glxscreens.c glxvisuals.c \
+                glxsingle.c glxvendor.c glxfbconfig.c glxswap.c
+
+AM_CFLAGS = -I.. -I$(top_srcdir)/include @GL_CFLAGS@ -UXFree86LOADER 
\ No newline at end of file
diff --git a/hw/dmx/input/Makefile.am b/hw/dmx/input/Makefile.am
new file mode 100644
index 000000000..7ba10ce44
--- /dev/null
+++ b/hw/dmx/input/Makefile.am
@@ -0,0 +1,11 @@
+noinst_LIBRARIES = libdmxinput.a
+
+RAWSRCS = lnx-keyboard.c lnx-ms.c lnx-ps2.c
+USBSRCS = usb-keyboard.c usb-mouse.c usb-other.c usb-common.c
+DRVSRCS = dmxdummy.c dmxbackend.c dmxconsole.c dmxcommon.c
+DMXSRCS = dmxinputinit.c dmxarg.c dmxsigio.c dmxevents.c \
+	  dmxxinput.c dmxmotion.c dmxeq.c dmxmap.c
+
+
+libdmxinput_a_SOURCES = ChkNotMaskEv.c $(RAWSRCS) $(USBSRCS) $(DRVSRCS) $(DMXSRCS) $(LIBSRCS)
+AM_CFLAGS = -I..
diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am
new file mode 100644
index 000000000..1f48cb02d
--- /dev/null
+++ b/hw/xfree86/Makefile.am
@@ -0,0 +1,36 @@
+SUBDIRS = common ddc dummylib i2c int10 fbdevhw os-support parser rac \
+          ramdac shadowfb vbe vgahw xaa xf1bpp xf4bpp xf8_16bpp \
+	  xf8_32wid loader scanpci dixmods
+
+bin_PROGRAMS = Xorg
+
+Xorg_SOURCES = dummy.c
+
+DISTCLEANFILES = dummy.c
+
+dummy.c:
+	touch $@
+
+OS_LIBS = os-support/bus/libbus.a \
+          os-support/@XORG_OS_SUBDIR@/lib@XORG_OS_SUBDIR@.a os-support/misc/libmisc.a
+
+XORG_LIBS = \
+            @XORG_CORE_LIBS@ \
+            common/libinit.a \
+            loader/libloader.a \
+            common/libcommon.a \
+            parser/libparser.a \
+            $(OS_LIBS) \
+            dummylib/libdummy.a \
+            dixmods/libdixmods.la \
+	    vgahw/libvgahw.la \
+	    $(top_builddir)/fb/libfb.la \
+            @XORG_LIBS@
+
+Xorg_LDADD = $(XORG_LIBS) \
+             @XSERVER_LIBS@ \
+             -ldl
+
+Xorg_LDFLAGS = -rdynamic
+
+sdk_HEADERS = xf86Date.h xf86Version.h xorgVersion.h
diff --git a/hw/xfree86/common/Makefile.am b/hw/xfree86/common/Makefile.am
new file mode 100644
index 000000000..34b6cc384
--- /dev/null
+++ b/hw/xfree86/common/Makefile.am
@@ -0,0 +1,97 @@
+noinst_LIBRARIES = libcommon.a libinit.a
+
+if XORG_BUS_SBUS
+SBUS_SOURCES = xf86sbusBus.c
+endif
+
+#if DEBUG
+#DEBUGSOURCES = xf86Debug.c
+#endif
+
+#if BUILDXV
+XVSOURCES = xf86xv.c xf86xvmc.c
+XVSDKINCS = xf86xv.h xf86xvmc.h
+#endif
+
+#if XKB
+XKBSOURCES = xf86XKB.c
+#endif
+
+#if XINPUT
+XISOURCES = xf86Xinput.c xisb.c
+XISDKINCS = xf86Xinput.h xisb.h
+#endif
+
+RANDRSOURCES = xf86RandR.c
+
+BUSSOURCES = xf86isaBus.c xf86pciBus.c xf86fbBus.c xf86noBus.c $(SBUS_SOURCES)
+
+#if LINUX
+KBDSOURCES = xf86KbdLnx.c
+# XXX psuedocodeish
+#else if BSD
+#KBDSOURCES = xf86KbdBSD.c
+#else if Mach && !GNU/Mach
+#KBDSOURCES = xf86KbdMach.c
+#else
+#KBDSOURCES = xf86Kbd.c
+#endif
+
+# shouldn't isaBus and pciBus only be built on the relevant architectures? -ds
+# ditto DoScanPci
+AM_LDFLAGS = -r
+libcommon_a_SOURCES = xf86Configure.c xf86Bus.c xf86Config.c \
+                      xf86Cursor.c xf86DGA.c xf86DPMS.c xf86DefModes.c \
+                      xf86DoProbe.c xf86DoScanPci.c xf86Events.c \
+                      xf86Globals.c xf86Io.c xf86AutoConfig.c \
+                      xf86MiscExt.c xf86Option.c xf86PM.c \
+                      xf86VidMode.c xf86fbman.c xf86cmap.c \
+                      ../scanpci/xf86ScanPci.c xf86Helper.c \
+                      xf86Mode.c xf86Build.h xorgHelper.c xf86Versions.c \
+                      $(XVSOURCES) $(BUSSOURCES) $(XKBSOURCES) \
+                      $(DEBUGSOURCES) $(XISOURCES) $(RANDRSOURCES) \
+                      $(KBDSOURCES)
+libinit_a_SOURCES = xf86Build.h xf86Init.c
+
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
+	   -I$(srcdir)/../loader -I$(srcdir)/../rac -I$(srcdir)/../parser \
+           -I$(srcdir)/../scanpci -I$(srcdir)/../vbe -I$(srcdir)/../int10 \
+	   -I$(srcdir)/../vgahw
+
+sdk_HEADERS = compiler.h fourcc.h xf86.h xf86Module.h xf86Opt.h \
+               xf86PciInfo.h xf86Priv.h xf86Privstr.h xf86Resources.h \
+               xf86cmap.h xf86fbman.h xf86str.h $(XISDKINCS) \
+               $(XVSDKINCS) atKeynames.h
+
+DISTCLEANFILES = xf86Build.h
+
+EXTRA_DIST = \
+	atKeynames.h \
+	compiler.h \
+	fourcc.h \
+	scoasm.h \
+	xf86.h \
+	xf86Build.h \
+	xf86Bus.h \
+	xf86Config.h \
+	xf86InPriv.h \
+	xf86Keymap.h \
+	xf86Module.h \
+	xf86Opt.h \
+	xf86PciInfo.h \
+	xf86Priv.h \
+	xf86Privstr.h \
+	xf86Resources.h \
+	xf86Xinput.h \
+	xf86cmap.h \
+	xf86fbman.h \
+	xf86pciBus.h \
+	xf86sbusBus.h \
+	xf86str.h \
+	xf86xv.h \
+	xf86xvmc.h \
+	xf86xvpriv.h \
+	xisb.h \
+	xf86Build.h.in
+
+AM_CFLAGS = $(XORG_CFLAGS)
diff --git a/hw/xfree86/ddc/Makefile.am b/hw/xfree86/ddc/Makefile.am
new file mode 100644
index 000000000..1000cd527
--- /dev/null
+++ b/hw/xfree86/ddc/Makefile.am
@@ -0,0 +1,9 @@
+sdk_HEADERS = edid.h vdif.h xf86DDC.h
+
+module_LTLIBRARIES = libddc.la
+libddc_la_SOURCES = xf86DDC.c edid.c interpret_edid.c print_edid.c \
+                   interpret_vdif.c print_vdif.c ddcProperty.c
+
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
+
+EXTRA_DIST = ddcPriv.h
diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
new file mode 100644
index 000000000..d346fdd7f
--- /dev/null
+++ b/hw/xfree86/dixmods/Makefile.am
@@ -0,0 +1,26 @@
+noinst_LTLIBRARIES = libdixmods.la
+
+module_LTLIBRARIES = libbitmap.la libfb.la
+
+# yes, this is a cheesy hack.
+AM_CFLAGS = -include xorg-config.h $(XORG_CFLAGS)
+INCLUDES = $(XORG_INCS) -I$(top_srcdir)/afb -I$(top_srcdir)/mfb \
+           -I$(top_srcdir)/cfb -I$(top_srcdir)/dbe -I$(srcdir)/../loader \
+           -I$(top_srcdir)/miext/layer -I$(top_srcdir)/miext/shadow
+
+libbitmap_la_SOURCES = bitmapmod.c
+libbitmap_la_LDFLAGS = -lXfont
+libfb_la_SOURCES = fbmodule.c
+
+libdixmods_la_SOURCES = \
+	afbmodule.c \
+	cfbmodule.c \
+	cfb16module.c \
+	cfb24module.c \
+	cfb32module.c \
+	mfbmodule.c \
+	miinitext.c \
+	laymodule.c \
+	shmodule.c \
+	$(top_srcdir)/Xext/xf86misc.c \
+	$(top_srcdir)/Xext/xf86vmode.c
diff --git a/hw/xfree86/dummylib/Makefile.am b/hw/xfree86/dummylib/Makefile.am
new file mode 100644
index 000000000..d96407d01
--- /dev/null
+++ b/hw/xfree86/dummylib/Makefile.am
@@ -0,0 +1,13 @@
+noinst_LIBRARIES = libdummy.a
+
+INCLUDES = $(XORG_INCS)
+
+libdummy_a_SOURCES = getvalidbios.c \
+                     pcitestmulti.c xf86allocscripi.c \
+                     xf86addrestolist.c xf86drvmsg.c xf86drvmsgverb.c \
+                     xf86getverb.c \
+                     xf86opt.c xf86screens.c xf86servisinit.c xf86verbose.c \
+                     strlcat.c strlcpy.c
+                     #xf86errorf.c xf86errorfverb.c xf86msg.c xf86msgverb.c \
+                     #logvwrite.c verrorf.c xf86info.c xalloc.c fatalerror.c \
+                     #$(srcdir)/../os-support/shared/sigiostubs.c
diff --git a/hw/xfree86/fbdevhw/Makefile.am b/hw/xfree86/fbdevhw/Makefile.am
new file mode 100644
index 000000000..722ea35b0
--- /dev/null
+++ b/hw/xfree86/fbdevhw/Makefile.am
@@ -0,0 +1,13 @@
+module_LTLIBRARIES = libfbdevhw.la
+
+#if FBDEVHW
+libfbdevhw_la_SOURCES = fbdevhw.c
+#else
+#libxorgfbdevhw_la_SOURCES = fbdevhwstub.c
+#endif
+
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../i2c
+
+sdk_HEADERS = fbdevhw.h
+
+EXTRA_DIST = fbpriv.h
diff --git a/hw/xfree86/i2c/Makefile.am b/hw/xfree86/i2c/Makefile.am
new file mode 100644
index 000000000..1b29aec01
--- /dev/null
+++ b/hw/xfree86/i2c/Makefile.am
@@ -0,0 +1,7 @@
+module_LTLIBRARIES = libi2c.la
+
+libi2c_la_SOURCES = xf86i2c.c xf86i2cmodule.c
+
+INCLUDES = $(XORG_INCS)
+
+sdk_HEADERS = xf86i2c.h
diff --git a/hw/xfree86/int10/Makefile.am b/hw/xfree86/int10/Makefile.am
new file mode 100644
index 000000000..99fd30731
--- /dev/null
+++ b/hw/xfree86/int10/Makefile.am
@@ -0,0 +1,30 @@
+module_LTLIBRARIES = libint10.la
+
+sdk_HEADERS = xf86int10.h
+
+if INT10_VM86
+AM_CFLAGS = -D_PC -D_VM86_LINUX $(XORG_CFLAGS)
+INCLUDES = $(XORG_INCS)
+libint10_la_SOURCES = \
+	helper_exec.c \
+	helper_mem.c \
+	pci.c \
+	xf86int10.c \
+	xf86int10module.c \
+	$(srcdir)/../os-support/linux/int10/vm86/linux_vm86.c \
+	$(srcdir)/../os-support/linux/int10/linux.c
+endif
+
+if INT10_X86EMU
+AM_CFLAGS = -D_X86EMU -D_PC $(XORG_CFLAGS)
+INCLUDES = $(XORG_INCS) -I/home/daniels/x/xorg/xc/extras/x86emu/include -I/home/daniels/x/xorg/xc/extras/x86emu/src/x86emu
+libint10_la_SOURCES = pci.c xf86int10module.c helper_exec.c helper_mem.c \
+	xf86int10.c xf86x86emu.c generic.c x86emu.c
+endif
+
+if INT10_STUB
+AM_CFLAGS = -D_PC -D_VM86_LINUX
+libint10_la_SOURCES = stub.c xf86int10module.c
+endif
+
+EXTRA_DIST = xf86x86emu.h
diff --git a/hw/xfree86/loader/Makefile.am b/hw/xfree86/loader/Makefile.am
new file mode 100644
index 000000000..948ee4ed8
--- /dev/null
+++ b/hw/xfree86/loader/Makefile.am
@@ -0,0 +1,40 @@
+noinst_LIBRARIES = libloader.a
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../parser -I$(srcdir)/../vbe \
+           -I$(srcdir)/../ddc -I$(srcdir)/../int10 -I$(srcdir)/../i2c \
+           -I$(srcdir)/../fbdevhw -I$(srcdir)/../scanpci -I$(srcdir)/../xaa \
+           -I$(srcdir)/../vgahw -I$(srcdir)/../ramdac -I$(srcdir)/../shadowfb
+
+#AM_LDFLAGS = -r
+AM_CFLAGS = -DIN_LOADER
+
+EXTRA_DIST = \
+	aout.h \
+	aoutloader.h \
+	ar.h \
+	coff.h \
+	coffloader.h \
+	dlloader.h \
+	elf.h \
+	elfloader.h \
+	hash.h \
+	loader.h \
+	loaderProcs.h \
+	sym.h
+
+libloader_a_SOURCES = \
+	loader.c \
+	loaderProcs.h \
+	loadext.c \
+        loadmod.c \
+	loadfont.c \
+        aoutloader.c \
+        dlloader.c \
+        elfloader.c \
+        coffloader.c \
+	os.c \
+	dixsym.c \
+	extsym.c \
+	fontsym.c \
+	misym.c \
+	xf86sym.c \
+	hash.c
diff --git a/hw/xfree86/os-support/Makefile.am b/hw/xfree86/os-support/Makefile.am
new file mode 100644
index 000000000..b55e9786d
--- /dev/null
+++ b/hw/xfree86/os-support/Makefile.am
@@ -0,0 +1,6 @@
+SUBDIRS = bus @XORG_OS_SUBDIR@ misc
+
+sdk_HEADERS = xf86_OSproc.h xf86_OSlib.h xf86_ansic.h xf86_libc.h xf86drm.h \
+              xf86drmCompat.h assyntax.h xf86OSKbd.h xf86OSmouse.h
+
+EXTRA_DIST = int10Defines.h xf86OSpriv.h
diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am
new file mode 100644
index 000000000..4e9d7861b
--- /dev/null
+++ b/hw/xfree86/os-support/bus/Makefile.am
@@ -0,0 +1,19 @@
+noinst_LIBRARIES = libbus.a
+sdk_HEADERS = xf86Pci.h
+
+PCI_SOURCES = @XORG_OS@Pci.c ix86Pci.c
+
+libbus_a_SOURCES = Pci.c $(PCI_SOURCES)
+
+if XORG_BUS_SBUS
+	libbus_a_SOURCES += Sbus.c
+endif
+
+INCLUDES = $(XORG_INCS)
+
+EXTRA_DIST = \
+	460gxPCI.h \
+	Pci.h \
+	altixPCI.h \
+	e8870PCI.h \
+	zx1PCI.h
diff --git a/hw/xfree86/os-support/linux/Makefile.am b/hw/xfree86/os-support/linux/Makefile.am
new file mode 100644
index 000000000..0dac944b9
--- /dev/null
+++ b/hw/xfree86/os-support/linux/Makefile.am
@@ -0,0 +1,27 @@
+if DRI
+DRI_SUBDIRS=drm
+DRI_LIBS=drm/libxorglinuxdrm.a
+endif
+
+noinst_LIBRARIES = liblinux.a
+liblinux_a_SOURCES = lnx_init.c lnx_video.c lnx_io.c lnx_kbd.c lnx_mouse.c \
+                     lnx_pci.c lnx_apm.c lnx_agp.c lnx_kmod.c lnx_KbdMap.c \
+                     ../shared/bios_mmap.c ../shared/VTsw_usl.c \
+                     ../shared/std_kbdEv.c ../shared/posix_tty.c \
+                     ../shared/vidmem.c ../shared/sigio.c \
+                     ../shared/stdResource.c ../shared/libc_wrapper.c \
+                     ../shared/at_scancode.c
+#libxorglinux_a_LIBADD = int10/libxorglinuxint10.a \
+#                         $(DRI_LIBS)
+
+sdk_HEADERS = agpgart.h
+
+AM_CFLAGS = -DUSESTDRES -DHAVE_SYSV_IPC
+
+SUBDIRS = $(DRI_SUBDIRS)
+
+INCLUDES = $(XORG_INCS) -I/usr/include/drm # FIXME this last part is crack
+
+EXTRA_DIST = \
+	lnx.h \
+	lnx_kbd.h
diff --git a/hw/xfree86/os-support/linux/drm/Makefile.am b/hw/xfree86/os-support/linux/drm/Makefile.am
new file mode 100644
index 000000000..6f2258f19
--- /dev/null
+++ b/hw/xfree86/os-support/linux/drm/Makefile.am
@@ -0,0 +1,8 @@
+INCLUDES = -I$(srcdir)/../../shared/drm/kernel
+
+noinst_LIBRARIES = libxorglinuxdrm.a
+libxorglinuxdrm_a_SOURCES = xf86drm.c xf86drmHash.c xf86drmRandom.c \
+                              xf86drmSL.c drmmodule.c
+
+sdk_LIBDIR = $(libdir)/xorg
+sdk_LIBS = libxorglinuxdrm.a
diff --git a/hw/xfree86/os-support/linux/int10/Makefile.am b/hw/xfree86/os-support/linux/int10/Makefile.am
new file mode 100644
index 000000000..598b09e15
--- /dev/null
+++ b/hw/xfree86/os-support/linux/int10/Makefile.am
@@ -0,0 +1,6 @@
+INCLUDES = -I$(srcdir)/../../../int10
+
+noinst_LIBRARIES = libxorglinuxint10.a
+libxorglinuxint10_a_SOURCES = linux.c ../../../int10/helper_mem.c \
+                                ../../../int10/pci.c \
+                                ../../../int10/xf86int10module.c
diff --git a/hw/xfree86/os-support/misc/Makefile.am b/hw/xfree86/os-support/misc/Makefile.am
new file mode 100644
index 000000000..11d253479
--- /dev/null
+++ b/hw/xfree86/os-support/misc/Makefile.am
@@ -0,0 +1,7 @@
+noinst_LIBRARIES = libmisc.a
+
+libmisc_a_SOURCES = Delay.c IODelay.c BUSmemcpy.c SlowBcopy.c 
+
+AM_LDFLAGS = -r
+
+INCLUDES = $(XORG_INCS)
diff --git a/hw/xfree86/parser/Makefile.am b/hw/xfree86/parser/Makefile.am
new file mode 100644
index 000000000..812df92df
--- /dev/null
+++ b/hw/xfree86/parser/Makefile.am
@@ -0,0 +1,11 @@
+noinst_LIBRARIES = libparser.a
+libparser_a_SOURCES = Device.c Files.c Flags.c Input.c Keyboard.c Layout.c \
+                      Module.c Video.c Monitor.c Pointer.c Screen.c \
+                      Vendor.c read.c scan.c write.c DRI.c Extensions.c
+
+EXTRA_DIST = \
+	Configint.h \
+	configProcs.h \
+	xf86Optrec.h \
+	xf86Parser.h \
+	xf86tokens.h
diff --git a/hw/xfree86/rac/Makefile.am b/hw/xfree86/rac/Makefile.am
new file mode 100644
index 000000000..2d02a81c2
--- /dev/null
+++ b/hw/xfree86/rac/Makefile.am
@@ -0,0 +1,6 @@
+module_LTLIBRARIES = librac.la
+librac_la_SOURCES = xf86RACmodule.c xf86RAC.c
+
+sdk_HEADERS = xf86RAC.h
+
+INCLUDES = $(XORG_INCS)
diff --git a/hw/xfree86/ramdac/Makefile.am b/hw/xfree86/ramdac/Makefile.am
new file mode 100644
index 000000000..e9edef244
--- /dev/null
+++ b/hw/xfree86/ramdac/Makefile.am
@@ -0,0 +1,16 @@
+module_LTLIBRARIES = libramdac.la
+libramdac_la_SOURCES = xf86RamDacMod.c xf86RamDac.c xf86RamDacCmap.c \
+                      xf86Cursor.c xf86HWCurs.c IBM.c BT.c TI.c \
+		      xf86BitOrder.c
+
+sdk_HEADERS = BT.h IBM.h TI.h xf86Cursor.h xf86RamDac.h
+
+DISTCLEANFILES = xf86BitOrder.c
+EXTRA_DIST = BTPriv.h IBMPriv.h TIPriv.h xf86CursorPriv.h xf86RamDacPriv.h
+
+AM_CFLAGS = -DXAAReverseBitOrder=xf86ReverseBitOrder -DRAMDAC_MODULE
+INCLUDES = $(XORG_INCS)
+
+xf86BitOrder.c:
+	echo "#define XAAReverseBitOrder xf86ReverseBitOrder" > $@
+	echo "#include \"$(srcdir)/../xaa/xaaBitOrder.c\"" >> $@
diff --git a/hw/xfree86/scanpci/Makefile.am b/hw/xfree86/scanpci/Makefile.am
new file mode 100644
index 000000000..f52d91b61
--- /dev/null
+++ b/hw/xfree86/scanpci/Makefile.am
@@ -0,0 +1,19 @@
+module_LTLIBRARIES = libscanpci.la libpcidata.la
+
+libpcidata_la_SOURCES = xf86PciData.c
+libscanpci_la_SOURCES = xf86ScanPci.c
+
+INCLUDES = $(XORG_INCS)
+
+EXTRA_DIST = \
+	xf86PciData.h \
+	xf86PciIds.h \
+	xf86PciStdIds.h \
+	xf86PciStr.h \
+	xf86ScanPci.h
+
+xf86PciData.c:
+	echo "#define PCIDATA" > $@
+	echo "#include \"$(srcdir)/xf86ScanPci.c\"" >> $@
+
+DISTCLEANFILES = xf86PciData.c
diff --git a/hw/xfree86/shadowfb/Makefile.am b/hw/xfree86/shadowfb/Makefile.am
new file mode 100644
index 000000000..d8e2e1dc9
--- /dev/null
+++ b/hw/xfree86/shadowfb/Makefile.am
@@ -0,0 +1,6 @@
+module_LTLIBRARIES = libshadowfb.la
+libshadowfb_la_SOURCES = sfbmodule.c shadow.c
+
+sdk_HEADERS = shadowfb.h
+
+INCLUDES = $(XORG_INCS)
diff --git a/hw/xfree86/vbe/Makefile.am b/hw/xfree86/vbe/Makefile.am
new file mode 100644
index 000000000..91d4a9129
--- /dev/null
+++ b/hw/xfree86/vbe/Makefile.am
@@ -0,0 +1,7 @@
+module_LTLIBRARIES = libvbe.la
+libvbe_la_SOURCES = vbe.c vbeModes.c vbe_module.c
+
+sdk_HEADERS = vbe.h vbeModes.h
+
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c \
+           -I$(srcdir)/../int10
diff --git a/hw/xfree86/vgahw/Makefile.am b/hw/xfree86/vgahw/Makefile.am
new file mode 100644
index 000000000..cffcea32f
--- /dev/null
+++ b/hw/xfree86/vgahw/Makefile.am
@@ -0,0 +1,5 @@
+module_LTLIBRARIES = libvgahw.la
+libvgahw_la_SOURCES = vgaHW.c vgaHWmodule.c
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../ddc -I$(srcdir)/../i2c
+
+sdk_HEADERS = vgaHW.h
diff --git a/hw/xfree86/xaa/Makefile.am b/hw/xfree86/xaa/Makefile.am
new file mode 100644
index 000000000..eeebf924e
--- /dev/null
+++ b/hw/xfree86/xaa/Makefile.am
@@ -0,0 +1,63 @@
+LSB_FIRST = l-xaaBitmap.c l3-xaaBitmap.c l-xaaStipple.c l3-xaaStipple.c \
+            l-xaaTEGlyph.c
+MSB_FIRST = m-xaaBitmap.c m3-xaaBitmap.c m-xaaStipple.c m3-xaaStipple.c \
+            m-xaaTEGlyph.c
+LSB_FIXED = lf-xaaBitmap.c lf3-xaaBitmap.c lf-xaaStipple.c lf3-xaaStipple.c \
+            lf-xaaTEGlyph.c
+MSB_FIXED = mf-xaaBitmap.c mf3-xaaBitmap.c mf-xaaStipple.c mf3-xaaStipple.c \
+            mf-xaaTEGlyph.c
+POLYSEG = s-xaaLine.c s-xaaDashLine.c
+
+module_LTLIBRARIES = libxaa.la
+libxaa_la_SOURCES = xaaInit.c xaaGC.c xaaInitAccel.c xaaFallback.c \
+                   xaaBitBlt.c xaaCpyArea.c xaaGCmisc.c xaaCpyWin.c \
+                   xaaCpyPlane.c xaaFillRect.c xaaTEText.c xaaNonTEText.c \
+                   xaaPCache.c xaaSpans.c xaaROP.c xaaImage.c xaaWrapper.c \
+                   xaaPaintWin.c xaaRect.c xaaLineMisc.c xaaBitOrder.c \
+                   xaaFillPoly.c xaaWideLine.c xaaTables.c xaaFillArc.c \
+                   xaaLine.c xaaDashLine.c xaaOverlay.c xaaOffscreen.c \
+                   xaaOverlayDF.c xaaStateChange.c xaaPict.c $(POLYSEG) \
+                   $(LSB_FIRST) $(MSB_FIRST) $(LSB_FIXED) $(MSB_FIXED)
+s-%.c:
+	echo "#define POLYSEGMENT" > $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
+l-%.c:
+	echo "#define LSBFIRST" > $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
+l3-%.c:
+	echo "#define LSBFIRST" > $@
+	echo "#define TRIPLE_BITS" >> $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
+lf-%.c:
+	echo "#define LSBFIRST" > $@
+	echo "#define FIXEDBASE" >> $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
+lf3-%.c:
+	echo "#define LSBFIRST" > $@
+	echo "#define TRIPLE_BITS" >> $@
+	echo "#define FIXEDBASE" >> $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
+m-%.c:
+	echo "#define MSBFIRST" > $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
+m3-%.c:
+	echo "#define MSBFIRST" > $@
+	echo "#define TRIPLE_BITS" >> $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
+mf-%.c:
+	echo "#define MSBFIRST" > $@
+	echo "#define FIXEDBASE" >> $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
+mf3-%.c:
+	echo "#define MSBFIRST" > $@
+	echo "#define TRIPLE_BITS" >> $@
+	echo "#define FIXEDBASE" >> $@
+	echo '#include "$(srcdir)/$*.c"' >> $@
+
+DISTCLEANFILES = $(POLYSEG) $(LSB_FIRST) $(LSB_FIXED) $(MSB_FIRST) $(MSB_FIXED)
+
+sdk_HEADERS = xaa.h xaalocal.h xaarop.h
+EXTRA_DIST = xaaWrapper.h xaacexp.h xaawrap.h xaaLine.c xaaDashLine.c \
+             xaaStipple.c xaaTEGlyph.c xaaBitmap.c
+
+INCLUDES = $(XORG_INCS)
diff --git a/hw/xfree86/xf1bpp/Makefile.am b/hw/xfree86/xf1bpp/Makefile.am
new file mode 100644
index 000000000..79275ee55
--- /dev/null
+++ b/hw/xfree86/xf1bpp/Makefile.am
@@ -0,0 +1,150 @@
+module_LTLIBRARIES = libxf1bpp.la
+
+sdk_HEADERS = xf1bpp.h mfbmap.h mfbunmap.h
+
+libxf1bppgen_a_SOURCES = \
+        mfbseg.c \
+        mfbpgbwht.c \
+        mfbpgbblak.c \
+        mfbpgbinv.c \
+        mfbigbwht.c \
+        mfbigbblak.c \
+        mfbpawhite.c \
+        mfbpablack.c \
+        mfbpainv.c \
+        mfbtewhite.c \
+        mfbteblack.c \
+        mfbplywhite.c \
+        mfbplyblack.c \
+        mfbplyinv.c \
+        mfbbltC.c \
+        mfbbltX.c \
+        mfbbltCI.c \
+        mfbbltO.c \
+        mfbbltG.c \
+        mfbtileC.c \
+        mfbtileG.c
+
+DISTCLEANFILES = $(libxf1bppgen_a_SOURCES)
+
+libxf1bppmfb_a_SOURCES = \
+        $(top_srcdir)/mfb/maskbits.c \
+        $(top_srcdir)/mfb/mfbbitblt.c \
+        $(top_srcdir)/mfb/mfbbres.c \
+        $(top_srcdir)/mfb/mfbbresd.c \
+        $(top_srcdir)/mfb/mfbbstore.c \
+        $(top_srcdir)/mfb/mfbclip.c \
+        $(top_srcdir)/mfb/mfbcmap.c \
+        $(top_srcdir)/mfb/mfbfillarc.c \
+        $(top_srcdir)/mfb/mfbfillrct.c \
+        $(top_srcdir)/mfb/mfbfillsp.c \
+        $(top_srcdir)/mfb/mfbfont.c \
+        $(top_srcdir)/mfb/mfbgc.c \
+        $(top_srcdir)/mfb/mfbgetsp.c \
+        $(top_srcdir)/mfb/mfbhrzvert.c \
+        $(top_srcdir)/mfb/mfbimage.c \
+        $(top_srcdir)/mfb/mfbline.c \
+        $(top_srcdir)/mfb/mfbmisc.c \
+        $(top_srcdir)/mfb/mfbpixmap.c \
+        $(top_srcdir)/mfb/mfbpntwin.c \
+        $(top_srcdir)/mfb/mfbpolypnt.c \
+        $(top_srcdir)/mfb/mfbpushpxl.c \
+        $(top_srcdir)/mfb/mfbscrclse.c \
+        $(top_srcdir)/mfb/mfbscrinit.c \
+        $(top_srcdir)/mfb/mfbsetsp.c \
+        $(top_srcdir)/mfb/mfbwindow.c \
+        $(top_srcdir)/mfb/mfbzerarc.c \
+        mfbmodule.c
+
+libxf1bpp_la_SOURCES = $(libxf1bppmfb_a_SOURCES) $(libxf1bppgen_a_SOURCES)
+
+AM_CFLAGS = -DXF86MONO -include mfbmap.h
+INCLUDES = $(XORG_INCS)
+
+mfbseg.c:
+	echo "#define POLYSEGMENT" > $@
+	echo "#include \"$(top_srcdir)/mfb/mfbline.c\"" >> $@
+mfbpgbwht.c:
+	echo "#define MFBPOLYGLYPHBLT xf1bppPolyGlyphBltWhite" > $@
+	echo "#define OPEQ |=" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbplygblt.c\"" >> $@
+mfbpgbblak.c:
+	echo "#define MFBPOLYGLYPHBLT xf1bppPolyGlyphBltBlack" > $@
+	echo "#define OPEQ &=~" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbplygblt.c\"" >> $@
+mfbpgbinv.c:
+	echo "#define MFBPOLYGLYPHBLT xf1bppPolyGlyphBltInvert" > $@
+	echo "#define OPEQ ^=" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbplygblt.c\"" >> $@
+mfbigbwht.c:
+	echo "#define MFBIMAGEGLYPHBLT xf1bppImageGlyphBltWhite" > $@
+	echo "#define OPEQ |=" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbimggblt.c\"" >> $@
+mfbigbblak.c:
+	echo "#define MFBIMAGEGLYPHBLT xf1bppImageGlyphBltBlack" > $@
+	echo "#define OPEQ &=~" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbimggblt.c\"" >> $@
+mfbpawhite.c:
+	echo "#define MFBSOLIDFILLAREA xf1bppSolidWhiteArea" > $@
+	echo "#define MFBSTIPPLEFILLAREA xf1bppStippleWhiteArea" >> $@
+	echo "#define OPEQ |=" >> $@
+	echo "#define EQWHOLEWORD =~0" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbpntarea.c\"" >> $@
+mfbpablack.c:
+	echo "#define MFBSOLIDFILLAREA xf1bppSolidBlackArea" > $@
+	echo "#define MFBSTIPPLEFILLAREA xf1bppStippleBlackArea" >> $@
+	echo "#define OPEQ &=~" >> $@
+	echo "#define EQWHOLEWORD =0" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbpntarea.c\"" >> $@
+mfbpainv.c:
+	echo "#define MFBSOLIDFILLAREA xf1bppSolidInvertArea" > $@
+	echo "#define MFBSTIPPLEFILLAREA xf1bppStippleInvertArea" >> $@
+	echo "#define OPEQ ^=" >> $@
+	echo "#define EQWHOLEWORD ^=~0" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbpntarea.c\"" >> $@
+mfbtewhite.c:
+	echo "#define OP" > $@
+	echo "#define CLIPTETEXT xf1bppImageGlyphBltWhite" >> $@
+	echo "#define MFBTEGLYPHBLT xf1bppTEGlyphBltWhite" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbtegblt.c\"" >> $@
+mfbteblack.c:
+	echo "#define OP ~" > $@
+	echo "#define CLIPTETEXT xf1bppImageGlyphBltBlack" >> $@
+	echo "#define MFBTEGLYPHBLT xf1bppTEGlyphBltBlack" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbtegblt.c\"" >> $@
+mfbplywhite.c:
+	echo "#define MFBFILLPOLY1RECT xf1bppFillPolyWhite" > $@
+	echo "#define OPEQ |=" >> $@
+	echo "#define EQWHOLEWORD =~0" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbply1rct.c\"" >> $@
+mfbplyblack.c:
+	echo "#define MFBFILLPOLY1RECT xf1bppFillPolyBlack" > $@
+	echo "#define OPEQ &=~" >> $@
+	echo "#define EQWHOLEWORD =0" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbply1rct.c\"" >> $@
+mfbplyinv.c:
+	echo "#define MFBFILLPOLY1RECT xf1bppFillPolyInvert" > $@
+	echo "#define OPEQ ^=" >> $@
+	echo "#define EQWHOLEWORD ^=~0" >> $@
+	echo "#include \"$(top_srcdir)/mfb/mfbply1rct.c\"" >> $@
+mfbbltC.c:
+	echo "#define MROP Mcopy" > $@
+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
+mfbbltX.c:
+	echo "#define MROP Mxor" > $@
+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
+mfbbltCI.c:
+	echo "#define MROP McopyInverted" > $@
+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
+mfbbltO.c:
+	echo "#define MROP Mor" > $@
+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
+mfbbltG.c:
+	echo "#define MROP M0" > $@
+	echo "#include \"$(top_srcdir)/mfb/mfbblt.c\"" >> $@
+mfbtileC.c:
+	echo "#define MROP Mcopy" > $@
+	echo "#include \"$(top_srcdir)/mfb/mfbtile.c\"" >> $@
+mfbtileG.c:
+	echo "#define MRop M0" > $@
+	echo "#include \"$(top_srcdir)/mfb/mfbtile.c\"" >> $@
diff --git a/hw/xfree86/xf4bpp/Makefile.am b/hw/xfree86/xf4bpp/Makefile.am
new file mode 100644
index 000000000..c1b24d3de
--- /dev/null
+++ b/hw/xfree86/xf4bpp/Makefile.am
@@ -0,0 +1,59 @@
+module_LTLIBRARIES = libxf4bpp.la
+
+sdk_HEADERS = xf4bpp.h
+
+libxf4bpp_la_SOURCES = \
+        ppcArea.c \
+        ppcBStore.c \
+        ppcClip.c \
+        ppcCpArea.c \
+        ppcCReduce.c \
+        ppcDepth.c \
+        ppcFillRct.c \
+        ppcWinFS.c \
+        ppcPixFS.c \
+        ppcGC.c \
+        ppcGetSp.c \
+        ppcImg.c \
+        ppcPixmap.c \
+        ppcPntWin.c \
+        ppcPolyPnt.c \
+        ppcPolyRec.c \
+        ppcQuery.c \
+        ppcRslvC.c \
+        ppcSetSp.c \
+        ppcWindow.c \
+        ppcIO.c \
+        emulOpStip.c \
+        emulRepAre.c \
+        emulTile.c \
+        vgaGC.c \
+        vgaBitBlt.c \
+        vgaImages.c \
+        vgaStipple.c \
+        vgaSolid.c \
+        offscreen.c \
+        wm3.c \
+        mfbimggblt.c \
+        mfbline.c \
+        mfbseg.c \
+        mfbhrzvert.c \
+        mfbbres.c \
+        mfbbresd.c \
+        mfbfillarc.c \
+        mfbzerarc.c \
+        vgamodule.c
+	
+libxf4bpp_la_LIBADD=../xf1bpp/libxf1bpp.la
+
+EXTRA_DIST = OScompiler.h ibmTrace.h ppcGCstr.h ppcSpMcro.h vgaReg.h \
+             vgaVideo.h wm3.h
+
+DISTCLEANFILES = mfbseg.c
+
+mfbseg.c:
+	echo "#define POLYSEGMENT" > $@
+	echo "#include \"$(top_srcdir)/mfb/mfbline.c\"" >> $@
+
+INCLUDES = $(XORG_INCS) -I$(srcdir)/../xf1bpp -I$(top_srcdir)/mfb \
+	  -I$(top_srcdir)/cfb
diff --git a/hw/xfree86/xf8_16bpp/Makefile.am b/hw/xfree86/xf8_16bpp/Makefile.am
new file mode 100644
index 000000000..b584362a7
--- /dev/null
+++ b/hw/xfree86/xf8_16bpp/Makefile.am
@@ -0,0 +1,12 @@
+module_LTLIBRARIES = libxf8_16bpp.la
+
+sdk_HEADERS = cfb8_16.h
+
+INCLUDES = $(XORG_INCS) -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
+
+libxf8_16bpp_la_SOURCES = \
+	cfb8_16module.c \
+	cfbscrinit.c \
+	cfbwindow.c
+
+libxf8_16bpp_la_LIBADD = $(top_builddir)/cfb16/libcfb16.la
diff --git a/hw/xfree86/xf8_32bpp/Makefile.am b/hw/xfree86/xf8_32bpp/Makefile.am
new file mode 100644
index 000000000..b9afbe557
--- /dev/null
+++ b/hw/xfree86/xf8_32bpp/Makefile.am
@@ -0,0 +1,34 @@
+module_LTLIBRARIES = libxf8_32bpp.la
+
+sdk_HEADERS = cfb8_32.h
+
+INCLUDES = -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
+
+libxf8_32bpp_la_SOURCES = \
+	cfbbstore.c \
+	cfbcpyarea.c \
+	cfbcpyplane.c \
+	cfbgcmisc.c \
+	cfbimage.c \
+	cfbpntwin.c \
+	cfbscrinit.c \
+	cfbwindow.c \
+	xf86overlay.c \
+	cfb8_32module.c \
+	cfbgc8.c \
+	cfbgc32.c \
+	cfbgcunder.c
+
+libxf8_32bpp_la_LIBADD = $(top_builddir)/cfb32/libcfb32.la
+
+EXTRA_DIST = cfbgc.c
+
+cfbgc8.c: $(srcdir)/cfbgc.c
+	echo '#define PSZ 8' > $@
+	echo '#include "$(srcdir)/cfbgc.c"' >> $@
+
+cfbgc32.c: $(srcdir)/cfbgc.c
+	echo '#define PSZ 32' > $@
+	echo '#include "$(srcdir)/cfbgc.c"' >> $@
+
+DISTCLEANFILES = cfbgc8.c cfbgc32.c
diff --git a/hw/xfree86/xf8_32wid/Makefile.am b/hw/xfree86/xf8_32wid/Makefile.am
new file mode 100644
index 000000000..1d1227189
--- /dev/null
+++ b/hw/xfree86/xf8_32wid/Makefile.am
@@ -0,0 +1,15 @@
+module_LTLIBRARIES = libxf8_32wid.la
+
+sdk_HEADERS = cfb8_32wid.h
+
+INCLUDES = $(XORG_INCS) -I$(top_srcdir)/cfb -I$(top_srcdir)/mfb
+
+libxf8_32wid_la_SOURCES = \
+	cfb8_32widmodule.c \
+	cfbscrinit.c \
+	cfbwindow.c \
+	cfbwid.c
+	
+#libxf8_32wid_la_LIBADD = $(top_builddir)/cfb16/libcfb16.la \
+#                         $(top_builddir)/cfb24/libcfb24.la \
+#                         $(top_builddir)/cfb32/libcfb32.la