Alphabetical order, please.

[obnox/wireshark/wip.git] / doc / Makefile.nmake

diff --git a/doc/Makefile.nmake b/doc/Makefile.nmake
index 0cd6f59fb81715e051f99350acbbc4ae964cce90..31f93495c2b3785223155468e5b17a446f14be63 100644 (file)
--- a/doc/Makefile.nmake
+++ b/doc/Makefile.nmake
@@ -33,13 +33,21 @@ doc: wireshark.html tshark.html wireshark-filter.html capinfos.html \
 man: wireshark.1 tshark.1 wireshark-filter.4 capinfos.1 editcap.1 \
        idl2wrs.1 mergecap.1 text2pcap.1 dumpcap.1 rawshark.1
 
-wireshark-tmp.pod: wireshark.pod ../AUTHORS-SHORT-FORMAT
-       copy /B wireshark.pod + ..\AUTHORS-SHORT-FORMAT wireshark-tmp.pod
+wireshark.pod: wireshark.pod.template AUTHORS-SHORT-FORMAT
+       copy /B wireshark.pod.template + AUTHORS-SHORT-FORMAT wireshark.pod
 
-../AUTHORS-SHORT-FORMAT:
-       cd ..
-       $(MAKE) /$(MAKEFLAGS) -f makefile.nmake AUTHORS-SHORT-FORMAT
-       cd doc
+#
+# Build the short version of the authors file for the about dialog
+#
+AUTHORS-SHORT: ../AUTHORS make-authors-short.pl
+       $(PERL) perlnoutf.pl make-authors-short.pl < ../AUTHORS > AUTHORS-SHORT
+
+#
+# Build the short version of the authors file with formatting codes for
+# the man page
+#
+AUTHORS-SHORT-FORMAT: AUTHORS-SHORT make-authors-format.pl
+    $(PERL) perlnoutf.pl make-authors-format.pl < AUTHORS-SHORT > AUTHORS-SHORT-FORMAT
 
 ws.css: ../docbook/ws.css
        copy ..\docbook\ws.css .
@@ -48,19 +56,14 @@ wireshark.1: wireshark.pod ../config.h
        $(POD2MAN)                     \
        --center="The Wireshark Network Analyzer" \
        --release=$(VERSION)                     \
-       wireshark-tmp.pod > wireshark.1
+       wireshark.pod > wireshark.1
 
-wireshark.html: wireshark-tmp.pod ../config.h ws.css
+wireshark.html: wireshark.pod ../config.h ws.css
        $(POD2HTML)                    \
        --title="The Wireshark Network Analyzer $(VERSION)" \
        --css=ws.css \
        --noindex                                 \
-       wireshark-tmp.pod > wireshark.html
-
-../$(INSTALL_DIR)/tshark.exe:
-       cd ..
-       $(MAKE) /$(MAKEFLAGS) -f makefile.nmake tshark.exe
-       cd doc
+       wireshark.pod > wireshark.html
 
 tshark.1: tshark.pod ../config.h
        $(POD2MAN)                     \
@@ -88,13 +91,6 @@ wireshark-filter.html: wireshark-filter.pod ../config.h ws.css
        --noindex                                 \
        wireshark-filter.pod > wireshark-filter.html
 
-wireshark-filter.pod: wireshark-filter.pod.template  ../$(INSTALL_DIR)/tshark.exe
-       cd ..
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake install-all
-       $(INSTALL_DIR)\tshark.exe -G | $(PERL) doc\dfilter2pod.pl doc\wireshark-filter.pod.template > doc\wireshark-filter.pod
-       $(MAKE) /$(MAKEFLAGS) -f Makefile.nmake clean-deps
-       cd doc
-
 capinfos.1: capinfos.pod ../config.h
        $(POD2MAN)                      \
        --center="The Wireshark Network Analyzer" \
@@ -188,9 +184,9 @@ rawshark.html: rawshark.pod ../config.h ws.css
        rawshark.pod > rawshark.html
 
 clean:
-       rm -f wireshark.html wireshark.1 wireshark-tmp.pod
+       rm -f wireshark.html wireshark.1 wireshark.pod
        rm -f tshark.html tshark.1
-       rm -f wireshark-filter.html wireshark-filter.4 wireshark-filter.pod
+       rm -f wireshark-filter.html wireshark-filter.4
        rm -f capinfos.html capinfos.1
        rm -f editcap.html editcap.1
        rm -f idl2wrs.html idl2wrs.1
@@ -200,6 +196,7 @@ clean:
        rm -f rawshark.html rawshark.1
        rm -f pod2htm*
        rm -f ws.css
+       rm -f AUTHORS-SHORT AUTHORS-SHORT-FORMAT
 
 distclean: clean