From 57564d65921fddf71cb01690ff8c80cd421c94d1 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Tue, 24 Mar 2015 14:28:48 -0700 Subject: [PATCH] GUAC-1145: Build HTML only. Clean up hierarchy. --- .gitignore | 7 ++----- Makefile | 18 ++++++++++++++++++ src/Makefile | 25 ------------------------- src/site.xslt | 2 +- 4 files changed, 21 insertions(+), 31 deletions(-) create mode 100644 Makefile delete mode 100644 src/Makefile diff --git a/.gitignore b/.gitignore index d5f4554..1a9f759 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -src/html -src/docbook-xsl -*.pdf -*.fo +/html +/docbook-xsl *~ -www/ diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..b73a131 --- /dev/null +++ b/Makefile @@ -0,0 +1,18 @@ + +FILES=$(shell find -name "*.xml") + +.PHONY: all clean link-docbook-xsl + +all: html/index.html + +clean: + $(RM) docbook-xsl + $(RM) -R html/ + +link-docbook-xsl: + $(RM) docbook-xsl + ln -s $(DOCBOOK_PATH) docbook-xsl + +html/index.html: $(FILES) src/site.xslt link-docbook-xsl + cd src; xsltproc -o ../html/ --xinclude site.xslt gug.xml + diff --git a/src/Makefile b/src/Makefile deleted file mode 100644 index c9ab815..0000000 --- a/src/Makefile +++ /dev/null @@ -1,25 +0,0 @@ - -FILES=$(shell find -name "*.xml") - -.PHONY: all clean link-docbook-xsl - -all: html/index.html gug.pdf - -clean: - $(RM) docbook-xsl - $(RM) -R html/ - $(RM) *.pdf *.fo - -link-docbook-xsl: - $(RM) docbook-xsl - ln -s $(DOCBOOK_PATH) docbook-xsl - -html/index.html: $(FILES) site.xslt link-docbook-xsl - xsltproc -o html/ --xinclude site.xslt gug.xml - -gug.fo: $(FILES) book.xslt link-docbook-xsl - xsltproc -o gug.fo --xinclude book.xslt gug.xml - -gug.pdf: gug.fo - fop -c fop-conf.xml -fo gug.fo -pdf gug.pdf - diff --git a/src/site.xslt b/src/site.xslt index 1792f3c..27ba377 100644 --- a/src/site.xslt +++ b/src/site.xslt @@ -5,7 +5,7 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"> - + 1