Use automake to build things in docbook/ .
authormorriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 10 Feb 2010 22:12:22 +0000 (22:12 +0000)
committermorriss <morriss@f5534014-38df-0310-8fa8-9805f1628bb7>
Wed, 10 Feb 2010 22:12:22 +0000 (22:12 +0000)
This at least gets the docbook source distributed, as requested in:

https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=3871

Still to do:
1) get out-of-source-tree builds working
2) automatically check that everything is distributed with distcheck
   (requires (1) but it may also require building the docbook
   directory as part of "make all")
3) (optional) use automake rules to actually build the stuff (currently
   Makefile.am is basically some automake stuff wrapped around standard
   Makefile rules. Could this done better?)

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@31858 f5534014-38df-0310-8fa8-9805f1628bb7

Makefile.am
configure.in
docbook/Makefile.am [moved from docbook/Makefile with 55% similarity]
docbook/Makefile.auto.am [deleted file]
docbook/Makefile.common
docbook/Makefile.nmake

index 3cd33e4133a3326fa26e01c7c39538f56352e393..fa305790bc81b622a39426ef2ed42d96eeeb94c6 100644 (file)
@@ -622,8 +622,6 @@ EXTRA_DIST = \
        debian/wireshark.manpages \
        debian/wireshark.menu   \
        dfilters                \
-       docbook/Makefile.auto.am        \
-       docbook/ws.css          \
        doxygen.cfg.in          \
        dumpcap.c       \
        editcap.c               \
@@ -824,7 +822,7 @@ else
 install-exec-hook:
 endif
 
-DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap wsutil
+DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap wsutil docbook
 
 if HAVE_PLUGINS
 SUBDIRS = tools wsutil wiretap epan plugins packaging help @wireshark_SUBDIRS@ . doc
index e44c00154ad7df7ac5d82bfa6b0fdb396b829197..99437d3cd418d4d570a81be937acbec8e5741012 100644 (file)
@@ -183,6 +183,22 @@ AC_PATH_PROG(FOP, fop)
 AC_CHECK_PROG(HAVE_FOP, fop, "yes", "no")
 AM_CONDITIONAL(HAVE_FOP, test x$HAVE_FOP = xyes)
 
+#
+# Look for something to convert HTML to text (for docbook/)
+#
+AC_PATH_PROG(ELINKS, elinks)
+AC_CHECK_PROG(HAVE_ELINKS, elinks, "yes", "no")
+AM_CONDITIONAL(HAVE_ELINKS, test x$HAVE_ELINKS = xyes)
+
+AC_PATH_PROG(LINKS, links)
+AC_CHECK_PROG(HAVE_LINKS, links, "yes", "no")
+AM_CONDITIONAL(HAVE_LINKS, test x$HAVE_LINKS = xyes)
+
+AC_PATH_PROG(LYNX, lynx)
+AC_CHECK_PROG(HAVE_LYNX, lynx, "yes", "no")
+AM_CONDITIONAL(HAVE_LYNX, test x$HAVE_LYNX = xyes)
+
+
 # Check for hhc (html help compiler)
 AC_PATH_PROG(HHC, hhc.exe)
 AC_CHECK_PROG(HAVE_HHC, hhc.exe, "yes", "no")
@@ -1742,6 +1758,7 @@ AC_OUTPUT(
   asn1/x509sat/Makefile
   asn1/x721/Makefile
   doc/Makefile
+  docbook/Makefile
   epan/Makefile
   epan/crc/Makefile
   epan/crypt/Makefile
similarity index 55%
rename from docbook/Makefile
rename to docbook/Makefile.am
index c74f90ee4ce864a1886a656183e59b292135eca3..7e74c0edf6cca8c408c7bdfcded9d4fe4a120261 100644 (file)
@@ -9,51 +9,55 @@
 # formatting objects processor
 # Additional options to fop.
 # This needs to contain at least the argument '-Xmx256m'
-FOP_OPTS?=-Xmx256m
+FOP_OPTS=-Xmx256m
 
-# fop executable
-# Leave these commented out if you don't have fop installed or you
-# don't want PDF documentation.
-# (if you have problems with fop, try to use an absolute path here)
-FOP=fop-0.20.5/fop.sh
-#
-# One SUSE 9.1 and newer uncomment the following line (make sure you have
-# at least fop-0.20.5-71.2)
-FOP=fop
+# fop executable is found in configure.in .
+# XXX - have it check for the right version (0.20.5 or newer)?
 
 # html to text converter for text version of release notes, e.g. elinks.
 # This could also be "lynx", or "true" if neither elinks nor lynx is installed
-#HTML2TXT=elinks -dump -dump-width 72
-#HTML2TXT=links -dump -width 72
 # (See Bug # 1446 for note re 'force-html' below)
-HTML2TXT?=lynx -dump -width=72 -nolist -stdin -force-html
-#HTML2TXT="true"
-
-
-PERL = perl
+# Sorry about the indenting, but that's what automake requires...
+if HAVE_ELINKS
+HTML2TXT=$(ELINKS) -dump -dump-width 72
+else
+if HAVE_LINKS
+HTML2TXT=$(LINKS) -dump -width 72
+else
+if HAVE_LYNX
+HTML2TXT=$(LYNX) -dump -width=72 -nolist -stdin -force-html
+else
+HTML2TXT="true"
+endif
+endif
+endif
 
 ############### YOU SHOULDN'T HAVE TO EDIT ANYTHING BELOW THIS LINE! ################
 
 include Makefile.common
 
-# the XSL processor
-XSLTPROC?="xsltproc"
-
-# the XML validator (from the xsltproc package)
-XMLLINT?="xmllint"
-
 # Automatically generate .pdf files from .fo files
 # Suse needs FOP_OPTS, Debian needs JAVA_OPTS
 .fo.pdf:
+if HAVE_FOP
        FOP_OPTS=$(FOP_OPTS) JAVA_OPTS=$(FOP_OPTS) $(FOP) $< $@
+else
+       false
+endif
 
 
-all: svn_version_check wsug.validated wsdg.validated release_notes.validated wsug wsdg release_notes 
-
-clean:
-       rm -rf $(CLEANFILES)
+if HAVE_XSLTPROC
+if HAVE_XMLLINT
+ALL_TARGETS=svn_version_check wsug.validated wsdg.validated release_notes.validated wsug wsdg release_notes 
+else
+ALL_TARGETS=svn_version_check wsug wsdg release_notes 
+endif
+else
+# if we don't have XSLTPROC, there's nothing to do...
+ALL_TARGETS=svn_version_check
+endif
 
-.SUFFIXES: .fo .pdf
+all: $(ALL_TARGETS)
 
 #
 # on every build, record the working copy revision string
@@ -62,15 +66,21 @@ clean:
 FORCE:
 
 svn_version_check: FORCE
-       cat check_svn_version.sh | tr -d '\015' | /bin/bash
+       cat $(srcdir)/check_svn_version.sh | tr -d '\015' | /bin/bash
 
 svn_version.xml: svn_version_check
 
 # Wireshark User Guide
-wsug: wsug_html_chunked user-guide.html user-guide-a4.pdf user-guide-us.pdf 
+if HAVE_FOP
+WSUG_TARGETS=wsug_html_chunked user-guide.html user-guide-a4.pdf user-guide-us.pdf 
+else
+WSUG_TARGETS=wsug_html_chunked user-guide.html
+endif
+
+wsug: $(WSUG_TARGETS)
 
 # validate the content
-wsug.validated: $(WSUG_SOURCE)
+wsug.validated: $(WSUG_SOURCE) wsluarm
        @ echo --- WSUG - VALIDATING XML ---
        $(XMLLINT) --valid --noout $<
        touch $@
@@ -78,50 +88,59 @@ wsug.validated: $(WSUG_SOURCE)
 # create html single page file
 user-guide.html: wsug_html/user-guide.html
 
-wsug_html/user-guide.html: $(WSUG_SOURCE)
+wsug_html/user-guide.html: $(WSUG_SOURCE) wsluarm
        @ echo --- WSUG - HTML SINGLE PAGE ---
        mkdir -p wsug_html/wsug_graphics/toolbar
-       cp wsug_graphics/*.* wsug_html/wsug_graphics
-       cp wsug_graphics/toolbar/* wsug_html/wsug_graphics/toolbar
-       cp ws.css wsug_html
-       $(XSLTPROC) --stringparam base.dir wsug_html/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $< > $@
+       cp $(srcdir)/wsug_graphics/*.* wsug_html/wsug_graphics
+       cp $(srcdir)/wsug_graphics/toolbar/* wsug_html/wsug_graphics/toolbar
+       cp $(srcdir)/ws.css wsug_html
+       $(XSLTPROC) --stringparam base.dir wsug_html/ --stringparam  use.id.as.filename 1 \
+                   --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ \
+                   --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 \
+                   --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $< > $@
        -chmod -R og+rX wsug_html
 
 # create html chunked page files
 wsug_html_chunked: wsug_html_chunked/index.html
 
-wsug_html_chunked/index.html: $(WSUG_SOURCE)
+wsug_html_chunked/index.html: $(WSUG_SOURCE) wsluarm
        @ echo --- WSUG - HTML CHUNKED ---
        mkdir -p wsug_html_chunked/wsug_graphics/toolbar
-       cp wsug_graphics/*.* wsug_html_chunked/wsug_graphics
-       cp wsug_graphics/toolbar/* wsug_html_chunked/wsug_graphics/toolbar
-       cp ws.css wsug_html_chunked
-       $(XSLTPROC) --stringparam base.dir wsug_html_chunked/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl $<
+       cp $(srcdir)/wsug_graphics/*.* wsug_html_chunked/wsug_graphics
+       cp $(srcdir)/wsug_graphics/toolbar/* wsug_html_chunked/wsug_graphics/toolbar
+       cp $(srcdir)/ws.css wsug_html_chunked
+       $(XSLTPROC) --stringparam base.dir wsug_html_chunked/ --stringparam  use.id.as.filename 1 \
+                   --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ \
+                   --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 \
+                   --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl $<
        -chmod -R og+rX wsug_html_chunked
 
 # create pdf file (through XSL-FO), portrait pages on US letter paper
 # you will get lot's of errors, but that's ok
-user-guide-us.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl
-ifdef FOP
+user-guide-us.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl wsluarm
        @ echo --- WSUG - PDF US PAPER ---
        $(XSLTPROC) --stringparam paper.type letter --nonet custom_layer_pdf.xsl $< > $@
-endif
 
 # create pdf file (through XSL-FO), portrait pages on A4 paper
 # you will get lot's of errors, but that's ok
-user-guide-a4.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl
-ifdef FOP
+user-guide-a4.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl wsluarm
        @ echo --- WSUG - PDF A4 PAPER ---
        $(XSLTPROC) --stringparam paper.type A4 --nonet custom_layer_pdf.xsl $< > $@
-endif
 
 wsluarm: make-wsluarm.pl $(WSLUA_MODULES)
-       $(PERL) make-wsluarm.pl $(WSLUA_MODULES)
+       mkdir -p wsluarm_src
+       $(PERL) $(srcdir)/make-wsluarm.pl $(WSLUA_MODULES)
        touch wsluarm
 
 
 # Wireshark Developer Guide
-wsdg: wsdg_html_chunked developer-guide.html developer-guide-a4.pdf developer-guide-us.pdf
+if HAVE_FOP
+WSDG_TARGETS=wsdg_html_chunked developer-guide.html developer-guide-a4.pdf developer-guide-us.pdf
+else
+WSDG_TARGETS=wsdg_html_chunked developer-guide.html
+endif
+
+wsdg: $(WSDG_TARGETS)
 
 # validate the content
 wsdg.validated: $(WSDG_SOURCE)
@@ -135,9 +154,12 @@ developer-guide.html: wsdg_html/developer-guide.html
 wsdg_html/developer-guide.html: $(WSDG_SOURCE)
        @ echo --- WSDG - HTML SINGLE PAGE ---
        mkdir -p wsdg_html/wsdg_graphics
-       cp wsdg_graphics/* wsdg_html/wsdg_graphics
-       cp ws.css wsdg_html
-       $(XSLTPROC) --stringparam base.dir wsdg_html/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $< > $@
+       cp $(srcdir)/wsdg_graphics/* wsdg_html/wsdg_graphics
+       cp $(srcdir)/ws.css wsdg_html
+       $(XSLTPROC) --stringparam base.dir wsdg_html/ --stringparam  use.id.as.filename 1 \
+                   --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ \
+                   --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 \
+                   --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $< > $@
        -chmod -R og+rX wsdg_html
 
 # create html chunked page files
@@ -146,29 +168,34 @@ wsdg_html_chunked: wsdg_html_chunked/index.html
 wsdg_html_chunked/index.html: $(WSDG_SOURCE)
        @ echo --- WSDG - HTML CHUNKED ---
        mkdir -p wsdg_html_chunked/wsdg_graphics
-       cp wsdg_graphics/* wsdg_html_chunked/wsdg_graphics
-       cp ws.css wsdg_html_chunked
-       $(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl $<
+       cp $(srcdir)/wsdg_graphics/* wsdg_html_chunked/wsdg_graphics
+       cp $(srcdir)/ws.css wsdg_html_chunked
+       $(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ --stringparam  use.id.as.filename 1 \
+                   --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/  \
+                   --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 \
+                   --stringparam html.stylesheet ws.css --nonet http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl $<
        -chmod -R og+rX wsdg_html_chunked
 
 # create pdf file (through XSL-FO), portrait pages on US letter paper
 # you will get lot's of errors, but that's ok
 developer-guide-us.fo: $(WSDG_SOURCE) custom_layer_pdf.xsl
-ifdef FOP
        @ echo --- WSDG - PDF US PAPER ---
        $(XSLTPROC) --stringparam paper.type letter --nonet custom_layer_pdf.xsl $< > $@
-endif
 
 # create pdf file (through XSL-FO), portrait pages on A4 paper
 # you will get lot's of errors, but that's ok
 developer-guide-a4.fo: $(WSDG_SOURCE) custom_layer_pdf.xsl
-ifdef FOP
        @ echo --- WSDG - PDF A4 PAPER ---
        $(XSLTPROC) --stringparam paper.type A4 --nonet custom_layer_pdf.xsl $< > $@
-endif
 
 
-release_notes: release-notes.html release-notes.txt release-notes-a4.pdf release-notes-us.pdf
+if HAVE_FOP
+RELEASE_NOTES_TARGETS=release-notes.html release-notes.txt release-notes-a4.pdf release-notes-us.pdf
+else
+RELEASE_NOTES_TARGETS=release-notes.html release-notes.txt
+endif
+
+release_notes: $(RELEASE_NOTES_TARGETS)
 
 # validate the content
 release_notes.validated: $(RELEASE_NOTES_SOURCE)
@@ -192,17 +219,22 @@ news: release-notes.txt
 # create pdf file (through XSL-FO), portrait pages on US letter paper
 # you will get lot's of errors, but that's ok
 release-notes-us.fo: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl
-ifdef FOP
        @ echo --- RELEASE NOTES - PDF US PAPER ---
        $(XSLTPROC) --stringparam paper.type letter --nonet custom_layer_pdf.xsl $< > $@
-endif
 
 # create pdf file (through XSL-FO), portrait pages on A4 paper
 # you will get lot's of errors, but that's ok
 release-notes-a4.fo: $(RELEASE_NOTES_SOURCE) custom_layer_pdf.xsl
-ifdef FOP
        @ echo --- RELEASE NOTES - PDF A4 PAPER ---
        $(XSLTPROC) --stringparam paper.type A4 --nonet custom_layer_pdf.xsl $< > $@
-endif
 
+clean-local:
+       -rm -rf $(CLEANDIRS)
+
+# XXX if we actually use automake to build this stuff, most of this shouldn't
+# be necessary
+EXTRA_DIST=$(WSUG_SOURCE) $(WSDG_SOURCE) $(RELEASE_NOTES_SOURCE) \
+          check_svn_version.sh make-wsluarm.pl Makefile.nmake
 
+MAINTAINERCLEANFILES = \
+       Makefile.in
diff --git a/docbook/Makefile.auto.am b/docbook/Makefile.auto.am
deleted file mode 100644 (file)
index 2e235b4..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
-#
-# Make the "Wireshark User Guide" and "Wireshark Developer Guide"
-# in several formats.
-# See the Readme.txt file for instructions.
-#
-# $Id$
-#
-
-# PLEASE NOTE: THIS FILE IS EXPERIMENTAL, USE Makefile INSTEAD!
-
-# if you need to change this, don't forget to change it in catalog.xml too
-
-# On suse 9.2, uncomment the following line:
-DOCBOOKXSL="/usr/share/xml/docbook/stylesheet/nwalsh/1.65.1"
-
-#DOCBOOKXSL="/usr/share/docbook-xsl"
-
-############### YOU SHOULDN'T HAVE TO EDIT ANYTHING BELOW THIS LINE! ################
-
-all: wsug wsdg
-
-wsug: wsug_validate wsug_pdf_a4 wsug_html wsug_html_chunked 
-
-clean:
-       rm -f *.html
-       rm -f htmlhelp.*
-       rm -f *.hhc
-       rm -f *.hhp
-       rm -f *.fo
-       rm -f *.pdf
-       rm -f *.chm
-       rm -rf wsug_html
-       rm -rf wsug_html_chunked
-       rm -rf wsug_chm
-       rm -rf wsdg_html
-       rm -rf wsdg_html_chunked
-       rm -rf wsdg_chm
-
-
-# validate the content
-wsug_validate:
-       @ echo --- VALIDATING XML ---
-       $(XMLLINT) --valid --noout user-guide.xml
-
-# create html single page file
-wsug_html:
-       @ echo --- HTML SINGLE PAGE ---
-       mkdir -p wsug_html
-       mkdir -p wsug_html/wsug_graphics
-       mkdir -p wsug_html/wsug_graphics/toolbar
-       cp ./wsug_graphics/*.* wsug_html/wsug_graphics
-       cp ./wsug_graphics/toolbar/*.* wsug_html/wsug_graphics/toolbar
-       $(XSLTPROC) --nonet $(DOCBOOKXSL)/html/docbook.xsl user-guide.xml > wsug_html/user-guide.html
-       
-# create html chunked page files
-wsug_html_chunked:
-       @ echo --- HTML CHUNKED ---
-       mkdir -p wsug_html_chunked
-       mkdir -p wsug_html_chunked/wsug_graphics
-       mkdir -p wsug_html_chunked/wsug_graphics/toolbar
-       cp ./wsug_graphics/*.* wsug_html_chunked/wsug_graphics
-       cp ./wsug_graphics/toolbar/*.* wsug_html_chunked/wsug_graphics/toolbar
-       $(XSLTPROC) --stringparam base.dir wsug_html_chunked/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsug_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --nonet $(DOCBOOKXSL)/html/chunk.xsl user-guide.xml
-
-# create pdf file (through XSL-FO), portrait pages on US letter paper (the default)
-# you will get lot's of errors, but that's ok
-wsug_pdf_us:
-if HAVE_FOP
-       @ echo --- PDF US PAPER ---
-       $(XSLTPROC) --nonet custom_layer_pdf.xsl $(DOCBOOKXSL)/fo/docbook.xsl user-guide.xml > user-guide.fo
-       $(FOP) user-guide.fo user-guide.pdf
-endif
-
-# create pdf file (through XSL-FO), portrait pages on A4 paper
-# you will get lot's of errors, but that's ok
-wsug_pdf_a4:
-if HAVE_FOP
-       @ echo --- PDF A4 PAPER ---
-       $(XSLTPROC) --stringparam paper.type A4 --nonet custom_layer_pdf.xsl user-guide.xml > user-guide.fo
-       $(FOP) user-guide.fo user-guide.pdf
-endif
-
-
-wsdg: wsdg_validate wsdg_html_chunked wsdg_pdf_a4 wsdg_html 
-
-# validate the content
-wsdg_validate:
-       @ echo --- VALIDATING XML ---
-       $(XMLLINT) --valid --noout developer-guide.xml
-
-# create html single page file
-wsdg_html:
-       @ echo --- HTML SINGLE PAGE ---
-       mkdir -p wsdg_html
-       mkdir -p wsdg_html/wsdg_graphics
-       mkdir -p wsdg_html/wsdg_graphics/toolbar
-       cp ./wsdg_graphics/*.* wsdg_html/wsdg_graphics
-       cp ./wsdg_graphics/toolbar/*.* wsdg_html/wsdg_graphics/toolbar
-       $(XSLTPROC) --nonet $(DOCBOOKXSL)/html/docbook.xsl developer-guide.xml > wsdg_html/developer-guide.html
-       
-# create html chunked page files
-wsdg_html_chunked:
-       @ echo --- HTML CHUNKED ---
-       mkdir -p wsdg_html_chunked
-       mkdir -p wsdg_html_chunked/wsdg_graphics
-       mkdir -p wsdg_html_chunked/wsdg_graphics/toolbar
-       cp ./wsdg_graphics/*.* wsdg_html_chunked/wsdg_graphics
-       cp ./wsdg_graphics/toolbar/*.* wsdg_html_chunked/wsdg_graphics/toolbar
-       $(XSLTPROC) --stringparam base.dir wsdg_html_chunked/ --stringparam  use.id.as.filename 1 --stringparam admon.graphics 1 --stringparam admon.graphics.path wsdg_graphics/ --stringparam section.autolabel 1 --stringparam  section.label.includes.component.label 1 --nonet $(DOCBOOKXSL)/html/chunk.xsl developer-guide.xml
-
-# create pdf file (through XSL-FO), portrait pages on US letter paper (the default)
-# you will get lot's of errors, but that's ok
-wsdg_pdf_us:
-if HAVE_FOP
-       @ echo --- PDF US PAPER ---
-       $(XSLTPROC) --nonet custom_layer_pdf.xsl $(DOCBOOKXSL)/fo/docbook.xsl developer-guide.xml > developer-guide.fo
-       $(FOP) developer-guide.fo developer-guide.pdf
-endif
-
-# create pdf file (through XSL-FO), portrait pages on A4 paper
-# you will get lot's of errors, but that's ok
-wsdg_pdf_a4:
-if HAVE_FOP
-       @ echo --- PDF A4 PAPER ---
-       $(XSLTPROC) --stringparam paper.type A4 --nonet custom_layer_pdf.xsl developer-guide.xml > developer-guide.fo
-       $(FOP) developer-guide.fo developer-guide.pdf
-endif
-
index 210123c7183971d99374f35874dba7c901c17331..e9c39dba2ac19ac6786d0ca6207c474cd58dff94 100644 (file)
@@ -179,8 +179,9 @@ WSDG_GRAPHICS =     \
 WSUG_SOURCE =  \
        user-guide.xml          \
        svn_version.xml         \
+       GPL_appendix.xml        \
+       custom_layer_pdf.xsl    \
        Makefile                \
-       wsluarm                 \
        $(WSUG_FILES)           \
        $(WSUG_GRAPHICS)
 
@@ -188,6 +189,8 @@ WSUG_SOURCE =       \
 WSDG_SOURCE =  \
        developer-guide.xml     \
        svn_version.xml         \
+       GPL_appendix.xml        \
+       custom_layer_pdf.xsl    \
        Makefile                \
        $(WSDG_FILES)           \
        $(WSDG_GRAPHICS)
@@ -205,14 +208,10 @@ CLEANFILES =      \
        *.pdf                   \
        *.validated             \
        wsdg_chm                \
-       wsdg_html               \
        wsdg_html.zip           \
-       wsdg_html_chunked       \
        wsdg_html_chunked.zip   \
        wsug_chm                \
-       wsug_html               \
        wsug_html.zip           \
-       wsug_html_chunked       \
        wsug_html_chunked.zip   \
        htmlhelp.*              \
        release_notes_chm       \
@@ -223,6 +222,11 @@ CLEANFILES =       \
        wsluarm                 \
        wsluarm_src/*.xml
 
+CLEANDIRS =    \
+       wsdg_html               \
+       wsdg_html_chunked       \
+       wsug_html               \
+       wsug_html_chunked
 
 WSLUA_MODULES = \
        ../epan/wslua/wslua_dumper.c \
index a096e05bae4fc8195c7cbafa72983b48d303d954..68fcf25b0dec74ad477e7625bd661cd170569ae7 100644 (file)
@@ -48,7 +48,7 @@ release_notes: release_notes.validated release_notes_x
 
 # Clean all
 clean:
-       rm -rf $(CLEANFILES)
+       rm -rf $(CLEANFILES) $(CLEANDIRS)
 
 # -- All -------------------------------------------------------------------------------
 
@@ -59,7 +59,7 @@ all_x: wsug.validated wsdg.validated release_notes.validated wsug_x wsdg_x relea
 wsug_x: wsug_html_chunked user-guide.html user-guide-a4.pdf user-guide-us.pdf user-guide.chm user-guide.zip
 
 # validate the content
-wsug.validated: $(WSUG_SOURCE)
+wsug.validated: $(WSUG_SOURCE) wsluarm
        @ echo --- WSUG - VALIDATING XML ---
        $(XMLLINT) --valid --noout user-guide.xml
        touch $@
@@ -67,7 +67,7 @@ wsug.validated: $(WSUG_SOURCE)
 # create html single page file
 user-guide.html: wsug_html/user-guide.html
 
-wsug_html/user-guide.html: $(WSUG_SOURCE)
+wsug_html/user-guide.html: $(WSUG_SOURCE) wsluarm
        @ echo --- WSUG - HTML SINGLE PAGE ---
        if not exist wsug_html\wsug_graphics\toolbar md wsug_html\wsug_graphics\toolbar
        cp wsug_graphics/*.* wsug_html/wsug_graphics
@@ -79,7 +79,7 @@ wsug_html/user-guide.html: $(WSUG_SOURCE)
 # create html chunked page files
 wsug_html_chunked: wsug_html_chunked\index.html
 
-wsug_html_chunked\index.html: $(WSUG_SOURCE)
+wsug_html_chunked\index.html: $(WSUG_SOURCE) wsluarm
        @ echo --- WSUG - HTML CHUNKED ---
        if not exist wsug_html_chunked\wsug_graphics\toolbar md wsug_html_chunked\wsug_graphics\toolbar
        cp wsug_graphics/*.* wsug_html_chunked/wsug_graphics
@@ -90,7 +90,7 @@ wsug_html_chunked\index.html: $(WSUG_SOURCE)
 
 # create pdf file (through XSL-FO), portrait pages on US letter paper (the default)
 # you will get lot's of errors, but that's ok
-user-guide-us.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl
+user-guide-us.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl wsluarm
 !ifdef FOP
        @ echo --- WSUG - PDF US PAPER ---
        $(XSLTPROC) --stringparam paper.type letter --nonet custom_layer_pdf.xsl user-guide.xml > $@
@@ -98,14 +98,14 @@ user-guide-us.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl
 
 # create pdf file (through XSL-FO), portrait pages on A4 paper
 # you will get lot's of errors, but that's ok
-user-guide-a4.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl
+user-guide-a4.fo: $(WSUG_SOURCE) custom_layer_pdf.xsl wsluarm
 !ifdef FOP
        @ echo --- WSUG - PDF A4 PAPER ---
        $(XSLTPROC) --stringparam paper.type A4 --nonet custom_layer_pdf.xsl user-guide.xml > $@
 !endif
 
 # create MS html help file (through html chunked pages)
-user-guide.chm: $(WSUG_SOURCE)
+user-guide.chm: $(WSUG_SOURCE) wsluarm
 !ifdef HHC_EXE
        @ echo --- WSUG - MICROSOFT HTML HELP ---
        if not exist wsug_chm\wsug_graphics\toolbar md wsug_chm\wsug_graphics\toolbar