[PATCH app-xinit 5/6] config: move xinit 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              |   10 +---------
 configure.ac             |    3 ++-
 xinit/.gitignore         |    1 +
 xinit/Makefile.am        |   11 +++++++++++
 xinit.c => xinit/xinit.c |    0
 6 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 xinit/.gitignore
 create mode 100644 xinit/Makefile.am
 rename xinit.c => xinit/xinit.c (100%)

diff --git a/.gitignore b/.gitignore
index 31e265f..d22ad9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -78,5 +78,4 @@ core
 # For example, !report.pc overrides *.pc. See 'man gitignore'
 # 
 startx
-xinit
 xinitrc
diff --git a/Makefile.am b/Makefile.am
index f47b5d7..d583ef9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,21 +19,13 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-SUBDIRS = man
+SUBDIRS = man xinit
 if LAUNCHD
 SUBDIRS += privileged_startx
 endif
 
-bin_PROGRAMS = xinit
 bin_SCRIPTS = startx
 
-AM_CFLAGS = $(CWARNFLAGS) $(XINIT_CFLAGS)
-AM_CPPFLAGS = -DXINITDIR=\"$(XINITDIR)\" -DBINDIR=\"$(bindir)\"
-xinit_LDADD = $(XINIT_LIBS)
-
-xinit_SOURCES =	\
-        xinit.c
-
 include $(top_srcdir)/cpprules.in
 
 xinitrcdir = $(XINITDIR)
diff --git a/configure.ac b/configure.ac
index c2cdf55..734f308 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,5 +183,6 @@ AC_SUBST(XCONFIGFILEMAN)
 
 AC_CONFIG_FILES([Makefile
 	man/Makefile
-	privileged_startx/Makefile])
+	privileged_startx/Makefile
+	xinit/Makefile])
 AC_OUTPUT
diff --git a/xinit/.gitignore b/xinit/.gitignore
new file mode 100644
index 0000000..72e11ca
--- /dev/null
+++ b/xinit/.gitignore
@@ -0,0 +1 @@
+xinit
diff --git a/xinit/Makefile.am b/xinit/Makefile.am
new file mode 100644
index 0000000..65f2ebd
--- /dev/null
+++ b/xinit/Makefile.am
@@ -0,0 +1,11 @@
+bin_PROGRAMS = xinit
+
+AM_CFLAGS = 		\
+	$(CWARNFLAGS)	\
+	$(XINIT_CFLAGS)
+
+AM_CPPFLAGS = 				\
+	-DXINITDIR=\"$(XINITDIR)\" 	\
+	-DBINDIR=\"$(bindir)\"
+
+xinit_LDADD = $(XINIT_LIBS)
diff --git a/xinit.c b/xinit/xinit.c
similarity index 100%
rename from xinit.c
rename to xinit/xinit.c
-- 
1.6.0.4