[PATCH app-xinit 6/6] config: move startx target in its own directory

[Gaetan Nadon]

This makes it much simpler to determine what code goes with which target

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 .gitignore                      |    1 -
 Makefile.am                     |    8 +++-----
 configure.ac                    |    1 +
 startx/.gitignore               |    1 +
 startx/Makefile.am              |   24 ++++++++++++++++++++++++
 startx.cpp => startx/startx.cpp |    0
 6 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 startx/.gitignore
 create mode 100644 startx/Makefile.am
 rename startx.cpp => startx/startx.cpp (100%)

diff --git a/.gitignore b/.gitignore
index d22ad9c..6832eb3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -77,5 +77,4 @@ core
 #		Edit the following section as needed
 # For example, !report.pc overrides *.pc. See 'man gitignore'
 # 
-startx
 xinitrc
diff --git a/Makefile.am b/Makefile.am
index d583ef9..fa55890 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,13 +19,11 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-SUBDIRS = man xinit
+SUBDIRS = man startx xinit
 if LAUNCHD
 SUBDIRS += privileged_startx
 endif
 
-bin_SCRIPTS = startx
-
 include $(top_srcdir)/cpprules.in
 
 xinitrcdir = $(XINITDIR)
@@ -59,9 +57,9 @@ endif
 xinitrc_DATA = xinitrc
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
-CLEANFILES = xinitrc startx $(launchagents_DATA)
+CLEANFILES = xinitrc $(launchagents_DATA)
 
-EXTRA_DIST = xinitrc.cpp startx.cpp org.x.startx.plist.cpp
+EXTRA_DIST = xinitrc.cpp org.x.startx.plist.cpp
 
 .PHONY: ChangeLog INSTALL
 
diff --git a/configure.ac b/configure.ac
index 734f308..972c44f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,5 +184,6 @@ AC_SUBST(XCONFIGFILEMAN)
 AC_CONFIG_FILES([Makefile
 	man/Makefile
 	privileged_startx/Makefile
+	startx/Makefile
 	xinit/Makefile])
 AC_OUTPUT
diff --git a/startx/.gitignore b/startx/.gitignore
new file mode 100644
index 0000000..a3393c0
--- /dev/null
+++ b/startx/.gitignore
@@ -0,0 +1 @@
+startx
diff --git a/startx/Makefile.am b/startx/Makefile.am
new file mode 100644
index 0000000..62a3075
--- /dev/null
+++ b/startx/Makefile.am
@@ -0,0 +1,24 @@
+
+include $(top_srcdir)/cpprules.in
+
+bin_SCRIPTS = startx
+CLEANFILES = $(bin_SCRIPTS)
+EXTRA_DIST = startx.cpp
+
+CPP_FILES_FLAGS = 			\
+	-DXINITDIR=$(XINITDIR)		\
+	-DXRDB=$(XRDB)			\
+	-DXMODMAP=$(XMODMAP)		\
+	-DTWM=$(TWM)			\
+	-DXCLOCK=$(XCLOCK)		\
+	-DXTERM=$(XTERM)		\
+	-DXSERVER=$(XSERVER)		\
+	-DXAUTH=$(XAUTH)		\
+	-DXINIT=$(XINIT)		\
+	-DLIBDIR=$(libdir)		\
+	-DSHELL_CMD=$(SHELL_CMD)	\
+	$(STARTX_COOKIE_FLAGS)		\
+	-D__libexecdir__="$(libexecdir)"\
+	-D__bindir__="$(bindir)"	\
+	-DLAUNCHD_ID_PREFIX="$(launchdidprefix)"
+
diff --git a/startx.cpp b/startx/startx.cpp
similarity index 100%
rename from startx.cpp
rename to startx/startx.cpp
-- 
1.6.0.4