[PATCH app-rstart 13/15] config: move scripts into their own directory

[Gaetan Nadon]

Complete the pattern of having targets in subdirs

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 .gitignore                       |    3 ---
 Makefile.am                      |   38 ++++++++------------------------------
 configure.ac                     |    1 +
 scripts/.gitignore               |    3 +++
 scripts/Makefile.am              |   26 ++++++++++++++++++++++++++
 config.in => scripts/config.in   |    0
 rstart.in => scripts/rstart.in   |    0
 rstartd.in => scripts/rstartd.in |    0
 8 files changed, 38 insertions(+), 33 deletions(-)
 create mode 100644 scripts/.gitignore
 create mode 100644 scripts/Makefile.am
 rename config.in => scripts/config.in (100%)
 rename rstart.in => scripts/rstart.in (100%)
 rename rstartd.in => scripts/rstartd.in (100%)

diff --git a/.gitignore b/.gitignore
index 3b773e9..54215bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -76,7 +76,4 @@ core
 #		Edit the following section as needed
 # For example, !report.pc overrides *.pc. See 'man gitignore'
 # 
-config
-rstart
-rstartd
 rstartd.real
diff --git a/Makefile.am b/Makefile.am
index a28dd22..05d1233 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,45 +19,23 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-SUBDIRS = man commands contexts samples specs
-
-# rstartd server
+SUBDIRS = man commands contexts samples scripts specs
 
 rstart_PROGRAMS = rstartd.real
 
-AM_CFLAGS = $(CWARNFLAGS) $(RSTART_CFLAGS)		\
-		-DSERVERNAME=\"rstart\"			\
-		-DDEFAULT_CONFIG=\"$(rstartdir)/config\"
+AM_CFLAGS = 					\
+	$(CWARNFLAGS) $(RSTART_CFLAGS)		\
+	-DSERVERNAME=\"rstart\"			\
+	-DDEFAULT_CONFIG=\"$(rstartdir)/config\"
 
 rstartd_real_LDADD = $(RSTART_LIBS)
 
 rstartd_real_SOURCES =	\
-        auth.c \
-        server.c \
+        auth.c		\
+        server.c	\
         server.h
 
-# config data
-
-rstart_DATA = config
-
-CONFIG_SUBSTS = -e 's|@rstartdir[@]|$(rstartdir)|g'
-config: config.in
-	$(AM_V_GEN)$(SED) $(CONFIG_SUBSTS) < $< > $@
-
-# wrapper scripts
-
-bin_SCRIPTS = rstart rstartd
-
-RSTART_SUBSTS = -e 's|@RSH[@]|$(RSH)|g'
-rstart: rstart.in
-	$(AM_V_GEN)$(SED) $(RSTART_SUBSTS) < $< > $@
-
-RSTARTD_SUBSTS = -e 's|@rstartdir[@]|$(rstartdir)|g'
-rstartd: rstartd.in
-	$(AM_V_GEN)$(SED) $(RSTARTD_SUBSTS) < $< > $@
-
-CLEANFILES = rstart rstartd config
-EXTRA_DIST = rstart.in rstartd.in config.in server.os2
+EXTRA_DIST = server.os2
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 
diff --git a/configure.ac b/configure.ac
index 8de7460..91ef8fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,5 +60,6 @@ AC_CONFIG_FILES([
 	commands/Makefile
 	contexts/Makefile
 	samples/Makefile
+	scripts/Makefile
 	specs/Makefile])
 AC_OUTPUT
diff --git a/scripts/.gitignore b/scripts/.gitignore
new file mode 100644
index 0000000..8f68431
--- /dev/null
+++ b/scripts/.gitignore
@@ -0,0 +1,3 @@
+config
+rstart
+rstartd
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
new file mode 100644
index 0000000..6416069
--- /dev/null
+++ b/scripts/Makefile.am
@@ -0,0 +1,26 @@
+
+# config data
+
+rstart_DATA = config
+dist_noinst_DATA = config.in
+
+CONFIG_SUBSTS = -e 's|@rstartdir[@]|$(rstartdir)|g'
+config: config.in
+	$(AM_V_GEN)$(SED) $(CONFIG_SUBSTS) < $< > $@
+
+CLEANFILES = $(rstart_DATA)
+
+# wrapper scripts
+
+bin_SCRIPTS = rstart rstartd
+dist_noinst_SCRIPTS = rstart.in rstartd.in
+
+RSTART_SUBSTS = -e 's|@RSH[@]|$(RSH)|g'
+rstart: rstart.in
+	$(AM_V_GEN)$(SED) $(RSTART_SUBSTS) < $< > $@
+
+RSTARTD_SUBSTS = -e 's|@rstartdir[@]|$(rstartdir)|g'
+rstartd: rstartd.in
+	$(AM_V_GEN)$(SED) $(RSTARTD_SUBSTS) < $< > $@
+
+CLEANFILES += $(bin_SCRIPTS)
diff --git a/config.in b/scripts/config.in
similarity index 100%
rename from config.in
rename to scripts/config.in
diff --git a/rstart.in b/scripts/rstart.in
similarity index 100%
rename from rstart.in
rename to scripts/rstart.in
diff --git a/rstartd.in b/scripts/rstartd.in
similarity index 100%
rename from rstartd.in
rename to scripts/rstartd.in
-- 
1.6.0.4