From f6e75ebf5f7f245e1cdeb883a1d2db74f2451fd4 Mon Sep 17 00:00:00 2001
From: Jeremy Huddleston <jeremyhu@freedesktop.org>
Date: Sat, 19 Apr 2008 08:47:20 -0700
Subject: Apple: Fixed make dist to include a missing header and not include
 generated sources

---
 privileged_startx/Makefile.am | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/privileged_startx/Makefile.am b/privileged_startx/Makefile.am
index 0a3956d..6a143ca 100644
--- a/privileged_startx/Makefile.am
+++ b/privileged_startx/Makefile.am
@@ -37,13 +37,15 @@ AM_CPPFLAGS = -DXINITDIR=\"$(xinitrcdir)\" -DSCRIPTDIR=\"$(privstartxdir)\" -DBI
 
 CPP_FILES_FLAGS = -DXINITDIR="$(xinitrcdir)" -DSCRIPTDIR="$(privstartxdir)" -DBINDIR="$(bindir)"
 
-privileged_startx_SOURCES =	\
-	privileged_startxServer.c \
-	privileged_startxUser.c \
+dist_privileged_startx_SOURCES = \
 	server.c \
 	client.c \
 	privileged_startx.c
 
+nodist_privileged_startx_SOURCES = \
+	privileged_startxServer.c \
+	privileged_startxUser.c
+
 BUILT_SOURCES = \
 	privileged_startxServer.c \
 	privileged_startxUser.c \
@@ -56,9 +58,17 @@ launchdaemons_DATA = $(launchdaemons_PRE:plist.cpp=plist)
 10-tmpdirs: 10-tmpdirs.cpp Makefile
 20-font_cache: 20-font_cache.cpp Makefile
 
-CLEANFILES = $(privstartx_SCRIPTS) $(BUILT_SOURCES) $(launchdaemons_DATA)
+CLEANFILES = \
+	$(privstartx_SCRIPTS) \
+	$(BUILT_SOURCES) \
+	$(launchdaemons_DATA)
 
-EXTRA_DIST = 10-tmpdirs.cpp 20-font_cache.cpp org.x.privileged_startx.plist.cpp privileged_startx.defs
+EXTRA_DIST = \
+	10-tmpdirs.cpp \
+	20-font_cache.cpp \
+	org.x.privileged_startx.plist.cpp \
+	privileged_startx.defs \
+	privileged_startx_types.h
 
 $(BUILT_SOURCES): privileged_startx.defs
 	mig -sheader privileged_startxServer.h privileged_startx.defs
-- 
cgit v1.2.3