[PATCH xorg-docs 1/3] Remove Makefile for specs/XProtocol. Now built in proto/x11proto

Gaetan Nadon memsize at videotron.ca
Thu Sep 9 09:48:16 PDT 2010


As a result of the recent DocBook conversion.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 Makefile.am                 |    2 +-
 configure.ac                |    3 +--
 specs/XProtocol/.gitignore  |    3 ---
 specs/XProtocol/Makefile.am |   34 ----------------------------------
 4 files changed, 2 insertions(+), 40 deletions(-)
 delete mode 100644 specs/XProtocol/.gitignore
 delete mode 100644 specs/XProtocol/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a46769b..9fb8317 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@
 #
 #  Process this file with autoconf to create configure.
 
-SUBDIRS = man sgml specs/XProtocol
+SUBDIRS = man sgml
 x11docdir = @X11DOCDIR@
 
 dist_x11doc_DATA = MAINTAINERS
diff --git a/configure.ac b/configure.ac
index d5f55e6..dfa6a6d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,5 +73,4 @@ AC_OUTPUT([Makefile
 	   sgml/graphics/Makefile
 	   sgml/input/Makefile
 	   sgml/platforms/Makefile
-	   sgml/security/Makefile
-	   specs/XProtocol/Makefile])
+	   sgml/security/Makefile])
diff --git a/specs/XProtocol/.gitignore b/specs/XProtocol/.gitignore
deleted file mode 100644
index 87e2e0f..0000000
--- a/specs/XProtocol/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-#		Add & Override for this directory and it's subdirectories
-index.*
-*.pdf
diff --git a/specs/XProtocol/Makefile.am b/specs/XProtocol/Makefile.am
deleted file mode 100644
index fc571e5..0000000
--- a/specs/XProtocol/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-x11docdir = @X11DOCDIR@/specs/XProtocol
-
-TBL = tbl
-EQN = eqn
-TROFF = groff -Tps
-MSMACROS = -ms
-UTIL = $(top_srcdir)/util
-protoSRCS = X11.protocol X11.keysyms X11.encoding glossary postproc
-indexSRCS = indexmacros.t
-SRCS = $(UTIL)/macros.t $(protoSRCS)
-ISRCS = $(indexSRCS) $(UTIL)/indexmacros.t
-EXTRA_DIST = $(indexSRCS) $(protoSRCS)
-
-x11doc_DATA = proto.pdf proto.idx.pdf
-if HAVE_PDFTK
-x11doc_DATA += x11.pdf
-endif
-
-x11.pdf: proto.pdf proto.idx.pdf
-	$(PDFTK) proto.pdf proto.idx.pdf cat output $@
-
-proto.pdf index.raw: $(SRCS)
-	$(TBL) $^ | $(EQN) | $(TROFF) $(MSMACROS) 2> index.raw | $(PS2PDF) - proto.pdf
-
-index.pageno: index.raw
-	tail -1 $< > $@
-
-index.troff: index.pageno $(UTIL)/block.awk $(UTIL)/fixindex.awk
-	grep -v '^.pn ' index.raw | sort -f -t: +1 -3 +0n -1n | awk -f $(UTIL)/fixindex.awk | awk -f $(UTIL)/block.awk > index.troff
-
-proto.idx.pdf: $(ISRCS) index.troff
-	cat $^ | $(TROFF) -me | $(PS2PDF) - proto.idx.pdf
-
-CLEANFILES = proto.pdf proto.idx.pdf x11.pdf index.raw index.pageno index.troff
-- 
1.6.0.4



More information about the xorg-devel mailing list