Move inputs under examples both in source code and installed director…

…y layout
nyetsche · Aug 9, 2011 · 74b2b2d · 74b2b2d
1 parent 020e30b
commit 74b2b2d
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 7 deletions.
diff --git a/Makefile.am b/Makefile.am
@@ -1,8 +1,8 @@
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = pub $(NOVA_SUBDIR) $(CONSTELLATION_SUBDIR) src docs examples inputs masterfiles
+SUBDIRS = pub $(NOVA_SUBDIR) $(CONSTELLATION_SUBDIR) src docs examples masterfiles
 
-DIST_SUBDIRS = pub src docs examples inputs masterfiles
+DIST_SUBDIRS = pub src docs examples masterfiles
 
 # Set explicitly to avoid picking up {nova,constellation,galaxy}/*.m4
 

diff --git a/configure.ac b/configure.ac
@@ -925,7 +925,7 @@ dnl ######################################################################
 dnl Now make the Makefiles
 dnl ######################################################################
 
-AC_CONFIG_FILES([Makefile pub/Makefile src/Makefile src/cf3lex.l docs/Makefile examples/Makefile inputs/Makefile masterfiles/Makefile])
+AC_CONFIG_FILES([Makefile pub/Makefile src/Makefile src/cf3lex.l docs/Makefile examples/Makefile examples/example_config/Makefile masterfiles/Makefile])
 
 m4_indir(incstart[]incend, [nova/output.m4])
 m4_indir(incstart[]incend, [constellation/output.m4])

diff --git a/examples/Makefile.am b/examples/Makefile.am
@@ -1,3 +1,6 @@
+SUBDIRS = example_config
+DIST_SUBDIRS = example_config
+
 examplesdir = @docdir@/examples
 dist_examples_DATA = $(srcdir)/*.cf
 

diff --git a/inputs/Makefile.am → examples/example_config/Makefile.am b/inputs/Makefile.am → examples/example_config/Makefile.am
@@ -1,7 +1,5 @@
-
-inputsdir = @docdir@/inputs
-inputs_DATA = failsafe.cf  cfengine_stdlib.cf  promises.cf  site.cf  update.cf
-EXTRA_DIST = *.cf
+exampleconfigdir = @docdir@/example_config
+dist_exampleconfig_DATA = $(srcdir)/failsafe.cf $(srcdir)/cfengine_stdlib.cf $(srcdir)/promises.cf $(srcdir)/site.cf $(srcdir)/update.cf
 
 #
 # Some basic clean ups

diff --git a/inputs/cfengine_stdlib.cf → examples/example_config/cfengine_stdlib.cf b/inputs/cfengine_stdlib.cf → examples/example_config/cfengine_stdlib.cf
diff --git a/inputs/failsafe.cf → examples/example_config/failsafe.cf b/inputs/failsafe.cf → examples/example_config/failsafe.cf
diff --git a/inputs/promises.cf → examples/example_config/promises.cf b/inputs/promises.cf → examples/example_config/promises.cf
diff --git a/inputs/site.cf → examples/example_config/site.cf b/inputs/site.cf → examples/example_config/site.cf
diff --git a/inputs/update.cf → examples/example_config/update.cf b/inputs/update.cf → examples/example_config/update.cf