Rename en_US to sources

The reason this directory exists is because we need to copy it into
$builddir so we can combine it with generated sources (we can't pass
multiple source paths into publican).

So instead of having en_US, renamed to en-US stop the confusion and rename
the sources to "sources". That gets copied to en-US which will then contain
the actual output.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

17 files changed, 20 insertions, 20 deletions

diff --git a/doc/Wayland/Makefile.am b/doc/Wayland/Makefile.am
index f8f03da..cba1655 100644
--- a/doc/Wayland/Makefile.am
+++ b/doc/Wayland/Makefile.am
@@ -5,7 +5,7 @@
 #
 # How this build works:
 # * the main target is Wayland, documentation ends up in $(builddir)/Wayland/
-# * hand-written chapters are located in en_US
+# * hand-written chapters are located in sources
 #   Publican does not take a source path, so to support out-of-tree builds
 #   these are copied to $(builddir)/en-US which is the actual directory
 #   Publican uses.
@@ -16,29 +16,29 @@
 #   $(builddir)/en-US
 # * run Publican on en-US
 publican_sources = \
-	$(srcdir)/en_US/Wayland.ent \
-	$(srcdir)/en_US/Wayland.xml \
-	$(srcdir)/en_US/Book_Info.xml \
-	$(srcdir)/en_US/Author_Group.xml \
-	$(srcdir)/en_US/Foreword.xml \
-	$(srcdir)/en_US/Preface.xml \
-	$(srcdir)/en_US/Revision_History.xml \
-	$(srcdir)/en_US/Introduction.xml \
-	$(srcdir)/en_US/Architecture.xml \
-	$(srcdir)/en_US/Protocol.xml \
-	$(srcdir)/en_US/Library.xml \
-	$(srcdir)/en_US/Compositors.xml \
-	$(srcdir)/en_US/images/icon.svg  \
-	$(srcdir)/en_US/images/wayland-architecture.png \
-	$(srcdir)/en_US/images/wayland.png  \
-	$(srcdir)/en_US/images/x-architecture.png
+	$(srcdir)/sources/Wayland.ent \
+	$(srcdir)/sources/Wayland.xml \
+	$(srcdir)/sources/Book_Info.xml \
+	$(srcdir)/sources/Author_Group.xml \
+	$(srcdir)/sources/Foreword.xml \
+	$(srcdir)/sources/Preface.xml \
+	$(srcdir)/sources/Revision_History.xml \
+	$(srcdir)/sources/Introduction.xml \
+	$(srcdir)/sources/Architecture.xml \
+	$(srcdir)/sources/Protocol.xml \
+	$(srcdir)/sources/Library.xml \
+	$(srcdir)/sources/Compositors.xml \
+	$(srcdir)/sources/images/icon.svg  \
+	$(srcdir)/sources/images/wayland-architecture.png \
+	$(srcdir)/sources/images/wayland.png  \
+	$(srcdir)/sources/images/x-architecture.png
 
 if HAVE_PUBLICAN
 if HAVE_XSLTPROC
 noinst_DATA = Wayland $(publican_targets)
 pubdir = $(docdir)/Wayland/en-US
 
-publican_targets = $(publican_sources:$(srcdir)/en_US%=$(builddir)/en-US%) \
+publican_targets = $(publican_sources:$(srcdir)/sources%=$(builddir)/en-US%) \
 	en-US/ProtocolSpec.xml en-US/ProtocolInterfaces.xml \
 	en-US/WaylandClientAPI.xml
 
@@ -71,10 +71,10 @@ en-US/WaylandClientAPI.xml: $(top_builddir)/doc/doxygen/xml/index.xml $(srcdir)/
 	$(AM_V_GEN)$(XSLTPROC) $(srcdir)/doxygen-to-publican.xsl \
 		$(top_builddir)/doc/doxygen/xml/clientAPI.xml > en-US/WaylandClientAPI.xml
 
-# Copy the en_US source files into en-US destination
+# Copy the sources source files into en-US destination
 # This is required for out-of-source-tree build as publican does not allow us
 # to specify the location of the source code.
-$(builddir)/en-US/%: $(srcdir)/en_US/% en-US/ProtocolSpec.xml en-US/ProtocolInterfaces.xml en-US/WaylandClientAPI.xml $(publican_sources)
+$(builddir)/en-US/%: $(srcdir)/sources/% en-US/ProtocolSpec.xml en-US/ProtocolInterfaces.xml en-US/WaylandClientAPI.xml $(publican_sources)
 	$(AM_V_GEN)cp -f $< $@
 	$(AM_V_GEN)chmod a+w $@
 
diff --git a/doc/Wayland/en_US/Architecture.xml b/doc/Wayland/sources/Architecture.xml
index 4af91ea..4af91ea 100644
--- a/doc/Wayland/en_US/Architecture.xml
+++ b/doc/Wayland/sources/Architecture.xml
diff --git a/doc/Wayland/en_US/Author_Group.xml b/doc/Wayland/sources/Author_Group.xml
index 2bdde62..2bdde62 100644
--- a/doc/Wayland/en_US/Author_Group.xml
+++ b/doc/Wayland/sources/Author_Group.xml
diff --git a/doc/Wayland/en_US/Book_Info.xml b/doc/Wayland/sources/Book_Info.xml
index 1f83c8c..1f83c8c 100644
--- a/doc/Wayland/en_US/Book_Info.xml
+++ b/doc/Wayland/sources/Book_Info.xml
diff --git a/doc/Wayland/en_US/Compositors.xml b/doc/Wayland/sources/Compositors.xml
index f674776..f674776 100644
--- a/doc/Wayland/en_US/Compositors.xml
+++ b/doc/Wayland/sources/Compositors.xml
diff --git a/doc/Wayland/en_US/Foreword.xml b/doc/Wayland/sources/Foreword.xml
index eeb16cc..eeb16cc 100644
--- a/doc/Wayland/en_US/Foreword.xml
+++ b/doc/Wayland/sources/Foreword.xml
diff --git a/doc/Wayland/en_US/Introduction.xml b/doc/Wayland/sources/Introduction.xml
index b3b89e7..b3b89e7 100644
--- a/doc/Wayland/en_US/Introduction.xml
+++ b/doc/Wayland/sources/Introduction.xml
diff --git a/doc/Wayland/en_US/Library.xml b/doc/Wayland/sources/Library.xml
index ab325d6..ab325d6 100644
--- a/doc/Wayland/en_US/Library.xml
+++ b/doc/Wayland/sources/Library.xml
diff --git a/doc/Wayland/en_US/Preface.xml b/doc/Wayland/sources/Preface.xml
index 61720a9..61720a9 100644
--- a/doc/Wayland/en_US/Preface.xml
+++ b/doc/Wayland/sources/Preface.xml
diff --git a/doc/Wayland/en_US/Protocol.xml b/doc/Wayland/sources/Protocol.xml
index 7542890..7542890 100644
--- a/doc/Wayland/en_US/Protocol.xml
+++ b/doc/Wayland/sources/Protocol.xml
diff --git a/doc/Wayland/en_US/Revision_History.xml b/doc/Wayland/sources/Revision_History.xml
index 2c540fe..2c540fe 100644
--- a/doc/Wayland/en_US/Revision_History.xml
+++ b/doc/Wayland/sources/Revision_History.xml
diff --git a/doc/Wayland/en_US/Wayland.ent b/doc/Wayland/sources/Wayland.ent
index da18a95..da18a95 100644
--- a/doc/Wayland/en_US/Wayland.ent
+++ b/doc/Wayland/sources/Wayland.ent
diff --git a/doc/Wayland/en_US/Wayland.xml b/doc/Wayland/sources/Wayland.xml
index 24a9876..24a9876 100644
--- a/doc/Wayland/en_US/Wayland.xml
+++ b/doc/Wayland/sources/Wayland.xml
diff --git a/doc/Wayland/en_US/images/icon.svg b/doc/Wayland/sources/images/icon.svg
index b2f16d0..b2f16d0 100644
--- a/doc/Wayland/en_US/images/icon.svg
+++ b/doc/Wayland/sources/images/icon.svg
diff --git a/doc/Wayland/en_US/images/wayland-architecture.png b/doc/Wayland/sources/images/wayland-architecture.png
index 4f92e0f..4f92e0f 100644
--- a/doc/Wayland/en_US/images/wayland-architecture.png
+++ b/doc/Wayland/sources/images/wayland-architecture.png
diff --git a/doc/Wayland/en_US/images/wayland.png b/doc/Wayland/sources/images/wayland.png
index c993792..c993792 100644
--- a/doc/Wayland/en_US/images/wayland.png
+++ b/doc/Wayland/sources/images/wayland.png
diff --git a/doc/Wayland/en_US/images/x-architecture.png b/doc/Wayland/sources/images/x-architecture.png
index 098205b..098205b 100644
--- a/doc/Wayland/en_US/images/x-architecture.png
+++ b/doc/Wayland/sources/images/x-architecture.png