From 2949c705f11f8710301555c039bcecbe748cabd9 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniel@fooishbar.org>
Date: Tue, 10 Jan 2006 03:23:05 +0000
Subject: [PATCH] Add all subdirs used to DIST_SUBDIRS, and files to
 EXTRA_DIST. Attempt to build xeglmodule.c, not xglxmodule.c. Add xf86Sbus.h
 to EXTRA_DIST, as _HEADERS doesn't appear to get the same     treatment as
 _SOURCES in terms of automatically DISTing.

---
 ChangeLog                             | 13 +++++++++++++
 hw/kdrive/Makefile.am                 |  3 +++
 hw/xfree86/os-support/bus/Makefile.am |  2 ++
 hw/xgl/Makefile.am                    |  5 +++++
 hw/xgl/egl/Makefile.am                |  4 +++-
 hw/xgl/egl/module/Makefile.am         |  2 +-
 hw/xgl/glx/Makefile.am                |  2 ++
 hw/xgl/glx/module/Makefile.am         |  2 +-
 8 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index dc0fdd4f1..7585565dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-01-10  Daniel Stone  <daniel@freedesktop.org>
+
+	* hw/xgl/**/Makefile.am:
+	* hw/kdrive/**/Makefile.am:
+	Add all subdirs used to DIST_SUBDIRS, and files to EXTRA_DIST.
+
+	* hw/xgl/egl/Makefile.am:
+	Attempt to build xeglmodule.c, not xglxmodule.c.
+
+	* hw/xfree86/os-support/bus/Makefile.am:
+	Add xf86Sbus.h to EXTRA_DIST, as _HEADERS doesn't appear to get the same
+	treatment as _SOURCES in terms of automatically DISTing.
+
 2006-01-08  Adam Jackson  <ajax@freedesktop.org>
 
 	* hw/xfree86/loader/dixsym.c:
diff --git a/hw/kdrive/Makefile.am b/hw/kdrive/Makefile.am
index 215ef3852..c8832ebac 100644
--- a/hw/kdrive/Makefile.am
+++ b/hw/kdrive/Makefile.am
@@ -23,3 +23,6 @@ SUBDIRS =			\
 	$(VESA_SUBDIRS)		\
 	$(XEPHYR_SUBDIRS)       \
 	fake
+
+DIST_SUBDIRS = vesa ati chips epson i810 mach64 mga neomagic nvidia pm2 r128 \
+               smi via fbdev sdl ephyr src linux fake sis300
diff --git a/hw/xfree86/os-support/bus/Makefile.am b/hw/xfree86/os-support/bus/Makefile.am
index b830b6d8e..308a01b31 100644
--- a/hw/xfree86/os-support/bus/Makefile.am
+++ b/hw/xfree86/os-support/bus/Makefile.am
@@ -54,3 +54,5 @@ libbus_la_SOURCES = Pci.c Pci.h $(PCI_SOURCES) $(PLATFORM_PCI_SOURCES) \
 INCLUDES = $(XORG_INCS)
 
 AM_CFLAGS = $(XORG_CFLAGS) @SERVER_DEFINES@ @LOADER_DEFINES@
+
+EXTRA_DIST = $(sdk_HEADERS)
diff --git a/hw/xgl/Makefile.am b/hw/xgl/Makefile.am
index c1ea814fd..8e32a26c7 100644
--- a/hw/xgl/Makefile.am
+++ b/hw/xgl/Makefile.am
@@ -10,6 +10,8 @@ if XEGL
 XEGL_SUBDIRS = egl
 endif
 
+DIST_SUBDIRS = glxext glx egl
+
 SUBDIRS = 		\
 	.		\
 	$(GLX_SUBDIRS)  \
@@ -52,6 +54,9 @@ libxgl_a_SOURCES =     \
         xglloader.c    \
 	xglglx.c
 
+EXTRA_DIST = \
+	xglmodule.h
+
 Xgl_LDFLAGS = -export-dynamic
 Xgl_SOURCES = \
 	xglinit.c \
diff --git a/hw/xgl/egl/Makefile.am b/hw/xgl/egl/Makefile.am
index a43bcda6c..701320de5 100644
--- a/hw/xgl/egl/Makefile.am
+++ b/hw/xgl/egl/Makefile.am
@@ -2,6 +2,8 @@ if XGL
 XGL_MODULE_DIRS = module
 endif
 
+DIST_SUBDIRS = module
+
 SUBDIRS =		  \
 	.		  \
 	$(XGL_MODULE_DIRS)
@@ -25,7 +27,7 @@ libxegl_la_SOURCES = \
 Xegl_DEPENDENCIES = @XEGL_LIBS@
 Xegl_LDFLAGS	  = -export-dynamic
 Xegl_SOURCES	  = \
-	xglxinit.c \
+	xeglinit.c \
 	$(top_srcdir)/mi/miinitext.c \
 	$(top_srcdir)/Xext/dpmsstubs.c \
 	$(top_srcdir)/Xi/stubs.c \
diff --git a/hw/xgl/egl/module/Makefile.am b/hw/xgl/egl/module/Makefile.am
index ec1e2c45e..7ed217322 100644
--- a/hw/xgl/egl/module/Makefile.am
+++ b/hw/xgl/egl/module/Makefile.am
@@ -11,4 +11,4 @@ libxegl_la_LIBADD   =	  \
 
 moduledir = @xglmoduledir@
 
-module_LTLIBRARIES = libxegl.la
\ No newline at end of file
+module_LTLIBRARIES = libxegl.la
diff --git a/hw/xgl/glx/Makefile.am b/hw/xgl/glx/Makefile.am
index 934efa1fc..0198d0906 100644
--- a/hw/xgl/glx/Makefile.am
+++ b/hw/xgl/glx/Makefile.am
@@ -2,6 +2,8 @@ if XGL
 XGL_MODULE_DIRS = module
 endif
 
+DIST_SUBDIRS = module
+
 SUBDIRS =		  \
 	.		  \
 	$(XGL_MODULE_DIRS)
diff --git a/hw/xgl/glx/module/Makefile.am b/hw/xgl/glx/module/Makefile.am
index 5c22c67f2..e2d1de74e 100644
--- a/hw/xgl/glx/module/Makefile.am
+++ b/hw/xgl/glx/module/Makefile.am
@@ -11,4 +11,4 @@ libxglx_la_LIBADD = \
 
 moduledir = @xglmoduledir@
 
-module_LTLIBRARIES = libxglx.la
\ No newline at end of file
+module_LTLIBRARIES = libxglx.la