From 9439297b7bc07dcb90f0d01da09eea1bac3d42ff Mon Sep 17 00:00:00 2001
From: Alan Coopersmith <Alan.Coopersmith@sun.com>
Date: Tue, 6 Dec 2005 15:50:35 +0000
Subject: [PATCH] Bugzilla #5219
 <https://bugs.freedesktop.org/show_bug.cgi?id=5219> Make     sure all
 optional sources are included in EXTRA_DIST, even if they     aren't used on
 the platform the distballs are made on.

---
 ChangeLog      |  7 +++++++
 os/Makefile.am | 37 +++++++++++++++++++------------------
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index aa0647d18..2b0f8aded 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-12-06  Alan Coopersmith  <alan.coopersmith@sun.com>
+
+	* os/Makefile.am: 
+	Bugzilla #5219 <https://bugs.freedesktop.org/show_bug.cgi?id=5219>
+	Make sure all optional sources are included in EXTRA_DIST,
+	even if they aren't used on the platform the distballs are made on.
+
 2005-12-03  Alan Coopersmith  <alan.coopersmith@sun.com>
 
 	* xorg/Makefile.am:
diff --git a/os/Makefile.am b/os/Makefile.am
index a363f29fe..c28435253 100644
--- a/os/Makefile.am
+++ b/os/Makefile.am
@@ -7,22 +7,10 @@ K5AUTH_SOURCES = k5auth.c
 SECURERPC_SOURCES = rpcauth.c
 INTERNALMALLOC_SOURCES = xalloc.c
 
-if XCSECURITY
 XCSECURITY_SOURCES = secauth.c
-endif
-
-if XDMCP
 XDMCP_SOURCES = xdmcp.c
-endif
-
-if LBX
 LBX_SOURCES = lbxio.c
-endif
-
-if NEED_STRLCAT
 STRLCAT_SOURCES = strlcat.c strlcpy.c
-endif
-
 XORG_SOURCES = log.c
 
 libos_la_SOURCES = 	\
@@ -39,11 +27,23 @@ libos_la_SOURCES = 	\
 	xdmauth.c	\
 	xstrans.c	\
 	xprintf.c	\
-	$(XCSECURITY_SOURCES) \
-	$(XDMCP_SOURCES) \
-	$(XORG_SOURCES) \
-	$(LBX_SOURCES) \
-	$(STRLCAT_SOURCES)
+	$(XORG_SOURCES)
+
+if XCSECURITY
+libos_la_SOURCES += $(XCSECURITY_SOURCES)
+endif
+
+if XDMCP
+libos_la_SOURCES += $(XDMCP_SOURCES)
+endif
+
+if LBX
+libos_la_SOURCES += $(LBX_SOURCES)
+endif
+
+if NEED_STRLCAT
+libos_la_SOURCES += $(STRLCAT_SOURCES)
+endif
 
 libcwrapper_la_SOURCES = \
 	$(top_srcdir)/hw/xfree86/os-support/shared/libc_wrapper.c
@@ -52,4 +52,5 @@ libcwrapper_la_CFLAGS = \
 	-I$(top_srcdir)/hw/xfree86/os-support \
 	$(AM_CFLAGS)
 
-EXTRA_DIST = $(K5AUTH_SOURCES) $(SECURERPC_SOURCES) $(INTERNALMALLOC_SOURCES)
+EXTRA_DIST = $(K5AUTH_SOURCES) $(SECURERPC_SOURCES) $(INTERNALMALLOC_SOURCES) \
+     $(XCSECURITY_SOURCES) $(XDMCP_SOURCES) $(LBX_SOURCES) $(STRLCAT_SOURCES)