[PATCH v2 libXpm] doc: move doc files to the newly created doc dir.

Gaetan Nadon memsize at videotron.ca
Thu Oct 21 12:51:52 PDT 2010


As per guidelines for all xorg modules.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---

Second edition. Includes the rename from CHANAGES to NEWS.old.
Patch 9/9 is dropped.
git format-patch with -M option is wonderful.

 Makefile.am                      |   15 ++++-----------
 CHANGES => NEWS.old              |    0
 configure.ac                     |    1 +
 FAQ.html => doc/FAQ.html         |    0
 doc/Makefile.am                  |    7 +++++++
 README.AMIGA => doc/README.AMIGA |    0
 README.MSW => doc/README.MSW     |    0
 README.html => doc/README.html   |    0
 xpm.PS.gz => doc/xpm.PS.gz       |  Bin 49010 -> 49010 bytes
 9 files changed, 12 insertions(+), 11 deletions(-)
 rename CHANGES => NEWS.old (100%)
 rename FAQ.html => doc/FAQ.html (100%)
 create mode 100644 doc/Makefile.am
 rename README.AMIGA => doc/README.AMIGA (100%)
 rename README.MSW => doc/README.MSW (100%)
 rename README.html => doc/README.html (100%)
 rename xpm.PS.gz => doc/xpm.PS.gz (100%)

diff --git a/Makefile.am b/Makefile.am
index 569341b..1f1bd8d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,23 +1,16 @@
 # Daniel Stone disowns all copyright on this file; no warranty is given as to its
 # suitability or otherwise.
 
-SUBDIRS = include src sxpm cxpm
+SUBDIRS = doc include src sxpm cxpm
 
 ACLOCAL_AMFLAGS = -I m4
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xpm.pc
-MAINTAINERCLEANFILES = ChangeLog INSTALL
-EXTRA_DIST = \
-	xpm.PS.gz \
-	CHANGES \
-	COPYRIGHT \
-	FAQ.html \
-	FILES \
-	README.AMIGA \
-	README.html \
-	README.MSW
 
+EXTRA_DIST = COPYRIGHT FILES
+
+MAINTAINERCLEANFILES = ChangeLog INSTALL
 
 .PHONY: ChangeLog INSTALL
 
diff --git a/CHANGES b/NEWS.old
similarity index 100%
rename from CHANGES
rename to NEWS.old
diff --git a/configure.ac b/configure.ac
index 166957e..8fc2caa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,7 @@ if test x$STAT_ZFILE = xyes ; then
 fi
 
 AC_CONFIG_FILES([Makefile
+                 doc/Makefile
                  include/Makefile
                  src/Makefile
                  sxpm/Makefile
diff --git a/FAQ.html b/doc/FAQ.html
similarity index 100%
rename from FAQ.html
rename to doc/FAQ.html
diff --git a/doc/Makefile.am b/doc/Makefile.am
new file mode 100644
index 0000000..7e8328f
--- /dev/null
+++ b/doc/Makefile.am
@@ -0,0 +1,7 @@
+EXTRA_DIST = \
+	CHANGES \
+	xpm.PS.gz \
+	FAQ.html \
+	README.AMIGA \
+	README.html \
+	README.MSW
diff --git a/README.AMIGA b/doc/README.AMIGA
similarity index 100%
rename from README.AMIGA
rename to doc/README.AMIGA
diff --git a/README.MSW b/doc/README.MSW
similarity index 100%
rename from README.MSW
rename to doc/README.MSW
diff --git a/README.html b/doc/README.html
similarity index 100%
rename from README.html
rename to doc/README.html
diff --git a/xpm.PS.gz b/doc/xpm.PS.gz
similarity index 100%
rename from xpm.PS.gz
rename to doc/xpm.PS.gz
-- 
1.6.0.4



More information about the xorg-devel mailing list