Move the generated documentation (man pages, AUTHORS-SHORT-FORMAT, and

AUTHORS-SHORT) into doc/.  This cleans up the top-level Makefile.am (no more
need to have rules for each man page in both files) and solves the
parallel-build problem described in:

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


git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@28784 f5534014-38df-0310-8fa8-9805f1628bb7
This commit is contained in:
morriss 2009-06-21 12:47:48 +00:00
parent 6879dc4684
commit a87241d7a7
7 changed files with 169 additions and 257 deletions

View File

@ -36,43 +36,6 @@ if HAVE_WARNINGS_AS_ERRORS
AM_CLEAN_CFLAGS = -Werror
endif
#
# This is a hideous hack.
#
# Automake needs to know into which sections to install various man
# pages; if the names in "man_MANS" have suffixes, it can infer the
# sections from the name (e.g., "hello.1" goes in section 1), but if
# they don't have suffixes, it can't tell what sections to put them, and
# it just gives up and doesn't create any rules to install them (and it
# gives up silently, so you have no clue what's wrong).
#
# Therefore, we can't just set "man_MANS" to a list of variables to be
# filled in by the configure script, as those variables don't have man
# page section numbers.
#
# It turns out (although this is not documented anywhere I could find
# in the automake Info file) that if you define, instead, variables with
# names like "man{section}_MANS", automake will infer that the names in
# those variables are the names of man pages to be installed in section
# "{section}".
#
# So, as all our man pages go in section 1, we define "man1_MANS" to
# contain all the man page.
#
# *However*, if "man_MANS" isn't defined at all, automake concludes that
# there are no man pages, the fact that, say, "man1_MANS" is defined
# nonwithstanding! (I suspect this is the result of a mistaken attempt
# to get people to fix their automake files not to use "MANS"; if "MANS"
# is defined, it prints a warning and sets the exit status, but doesn't
# exit, and then it just gives up if "man_MANS" isn't defined,
# presumably on the theory that the only reason it wouldn't be defined
# is because the automake file uses the obsolete "MANS" variable instead
# of the shiny new "man_MANS" variable.)
#
# So we also define "man_MANS", but don't define it as anything;
# automake will arrange that the Makefile define it as the union of all
# the "man{section}_MANS" variables.
#
bin_PROGRAMS = \
@wireshark_bin@ \
@tshark_bin@ \
@ -86,19 +49,6 @@ bin_PROGRAMS = \
@rawshark_bin@
bin_SCRIPTS = @idl2wrs_bin@
man1_MANS = \
@wireshark_man@ \
@tshark_man@ \
@text2pcap_man@ \
@mergecap_man@ \
@capinfos_man@ \
@editcap_man@ \
@dumpcap_man@ \
@idl2wrs_man@ \
@rawshark_man@
man4_MANS = @wiresharkfilter_man@
man_MANS =
EXTRA_PROGRAMS = wireshark tshark capinfos editcap mergecap dftest \
randpkt text2pcap dumpcap rawshark
EXTRA_SCRIPTS = idl2wrs
@ -110,10 +60,8 @@ idl2wrs: tools/idl2wrs.sh Makefile
#
# Wireshark configuration files are put in $(pkgdatadir).
#
pkgdata_DATA = AUTHORS-SHORT COPYING manuf services wireshark.html \
tshark.html wireshark-filter.html capinfos.html editcap.html \
idl2wrs.html mergecap.html text2pcap.html dumpcap.html \
rawshark.html ws.css cfilters colorfilters dfilters smi_modules ipmap.html
pkgdata_DATA = COPYING manuf services cfilters colorfilters dfilters \
smi_modules ipmap.html
#
# Install the Diameter DTD and XML files in the "diameter" subdirectory
@ -486,19 +434,6 @@ FORCE:
svnversion.h: FORCE
LANG=C $(PERL) $(srcdir)/make-version.pl $(srcdir)
#
# Build the short version of the authors file for the about dialog
#
AUTHORS-SHORT: AUTHORS make-authors-short.pl
$(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-short.pl < $(srcdir)/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) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-format.pl < AUTHORS-SHORT > AUTHORS-SHORT-FORMAT
#
# Build shell scripts by doing variable substitution.
# Taken from autoconf 2.13.
@ -548,10 +483,7 @@ CLEANFILES = \
# included in that list.)
#
DISTCLEANFILES = \
AUTHORS-SHORT \
AUTHORS-SHORT-FORMAT \
ps.c \
ws.css
ps.c
MAINTAINERCLEANFILES = \
$(GENERATED_FILES) \
@ -792,15 +724,12 @@ EXTRA_DIST = \
image/wssplash.xpm \
image/wssplash-dev.xpm \
ipmap.html \
make-authors-format.pl \
make-authors-short.pl \
make-manuf \
make-tapreg-dotc \
make-version.pl \
manuf \
manuf.tmpl \
mergecap.c \
perlnoutf.pl \
print.ps \
$(diameter_DATA) \
$(dtds_DATA) \
@ -827,98 +756,15 @@ endif
DIST_SUBDIRS = asn1 codecs doc epan gtk help packaging plugins tools wiretap wsutil
if HAVE_PLUGINS
SUBDIRS = tools wsutil wiretap doc epan plugins packaging help @wireshark_SUBDIRS@
SUBDIRS = tools wsutil wiretap epan plugins packaging help @wireshark_SUBDIRS@ . doc
else
SUBDIRS = tools wsutil wiretap doc epan packaging help @wireshark_SUBDIRS@
SUBDIRS = tools wsutil wiretap epan packaging help @wireshark_SUBDIRS@ . doc
endif
help/faq.txt: $(srcdir)/help/faq.py
(cd help ; \
$(MAKE) faq.txt ;)
wireshark.1: doc/wireshark.pod AUTHORS-SHORT-FORMAT
(cd doc ; \
$(MAKE) ../wireshark.1 )
tshark.1: doc/tshark.pod
(cd doc ; \
$(MAKE) ../tshark.1 )
wireshark-filter.4: tshark doc/wireshark-filter.pod.template
(cd doc ; \
$(MAKE) ../wireshark-filter.4 )
capinfos.1: doc/capinfos.pod
(cd doc ; \
$(MAKE) ../capinfos.1 )
editcap.1: doc/editcap.pod
(cd doc ; \
$(MAKE) ../editcap.1 )
idl2wrs.1: doc/idl2wrs.pod
(cd doc ; \
$(MAKE) ../idl2wrs.1 )
mergecap.1: doc/mergecap.pod
(cd doc ; \
$(MAKE) ../mergecap.1 )
text2pcap.1: doc/text2pcap.pod
(cd doc ; \
$(MAKE) ../text2pcap.1 )
dumpcap.1: doc/dumpcap.pod
(cd doc ; \
$(MAKE) ../dumpcap.1 )
rawshark.1: doc/rawshark.pod
(cd doc ; \
$(MAKE) ../rawshark.1 )
ws.css: $(srcdir)/docbook/ws.css
cp $(srcdir)/docbook/ws.css .
wireshark.html: doc/wireshark.pod AUTHORS-SHORT-FORMAT ws.css
(cd doc ; \
$(MAKE) ../wireshark.html )
tshark.html: doc/tshark.pod ws.css
(cd doc ; \
$(MAKE) ../tshark.html )
wireshark-filter.html: tshark doc/wireshark-filter.pod.template ws.css
(cd doc ; \
$(MAKE) ../wireshark-filter.html )
capinfos.html: doc/capinfos.pod ws.css
(cd doc ; \
$(MAKE) ../capinfos.html )
editcap.html: doc/editcap.pod ws.css
(cd doc ; \
$(MAKE) ../editcap.html )
idl2wrs.html: doc/idl2wrs.pod ws.css
(cd doc ; \
$(MAKE) ../idl2wrs.html )
mergecap.html: doc/mergecap.pod ws.css
(cd doc ; \
$(MAKE) ../mergecap.html )
text2pcap.html: doc/text2pcap.pod ws.css
(cd doc ; \
$(MAKE) ../text2pcap.html )
dumpcap.html: doc/dumpcap.pod ws.css
(cd doc ; \
$(MAKE) ../dumpcap.html )
rawshark.html: doc/rawshark.pod ws.css
(cd doc ; \
$(MAKE) ../rawshark.html )
libtool: $(LIBTOOL_DEPS)
$(SHELL) ./config.status --recheck

View File

@ -391,18 +391,6 @@ svnversion.h: $(SVNENTRIES)
rm -f svnversion.h
$(PERL) make-version.pl
#
# 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
#
# Build "tshark-tap-register.c", which contains a function
@ -435,8 +423,7 @@ clean-local: clean-deps
capinfos.obj editcap.obj mergecap.obj text2pcap.obj \
nio-ie5.obj update.obj \
text2pcap-scanner.obj text2pcap-scanner.c rdps.obj \
rdps.pdb rdps.exe rdps.ilk config.h ps.c AUTHORS-SHORT \
AUTHORS-SHORT-FORMAT $(LIBS_CHECK) \
rdps.pdb rdps.exe rdps.ilk config.h ps.c $(LIBS_CHECK) \
dftest.obj dftest.exe randpkt.obj randpkt.ext \
doxygen.cfg \
$(RESOURCES) libwireshark.dll wiretap-$(WTAP_VERSION).dll \
@ -635,7 +622,7 @@ codecs::
$(MAKE) /$(MAKEFLAGS) -f Makefile.nmake
cd ..
gtk:: help config.h svnversion.h AUTHORS-SHORT doxygen
gtk:: help config.h svnversion.h doxygen
cd gtk
$(MAKE) /$(MAKEFLAGS) /f Makefile.nmake libui.lib
cd ..
@ -960,12 +947,12 @@ install-generated-files:
if exist capinfos.pdb xcopy capinfos.pdb $(INSTALL_DIR) /d
if exist editcap.exe xcopy editcap.exe $(INSTALL_DIR) /d
if exist editcap.pdb xcopy editcap.pdb $(INSTALL_DIR) /d
xcopy ".\AUTHORS-SHORT" $(INSTALL_DIR) /d
xcopy "doc\AUTHORS-SHORT" $(INSTALL_DIR) /d
xcopy ".\manuf" $(INSTALL_DIR) /d
xcopy ".\services" $(INSTALL_DIR) /d
xcopy ".\README" $(INSTALL_DIR) /d
xcopy ".\README.win32" $(INSTALL_DIR) /d
xcopy ".\AUTHORS-SHORT" $(INSTALL_DIR) /d
xcopy "doc\AUTHORS-SHORT-FORMAT" $(INSTALL_DIR) /d
xcopy ".\COPYING" $(INSTALL_DIR) /d
copy ".\NEWS" $(INSTALL_DIR)\NEWS.txt
xcopy ".\cfilters" $(INSTALL_DIR) /d

View File

@ -24,173 +24,240 @@
# We include dependencies on ../config.h in order to
# capture when $(VERSION) changes.
wireshark-tmp.pod: $(srcdir)/wireshark.pod $(top_builddir)/AUTHORS-SHORT-FORMAT
cat $(srcdir)/wireshark.pod $(top_builddir)/AUTHORS-SHORT-FORMAT > wireshark-tmp.pod
#
# This is a hideous hack.
#
# Automake needs to know into which sections to install various man
# pages; if the names in "man_MANS" have suffixes, it can infer the
# sections from the name (e.g., "hello.1" goes in section 1), but if
# they don't have suffixes, it can't tell what sections to put them, and
# it just gives up and doesn't create any rules to install them (and it
# gives up silently, so you have no clue what's wrong).
#
# Therefore, we can't just set "man_MANS" to a list of variables to be
# filled in by the configure script, as those variables don't have man
# page section numbers.
#
# It turns out (although this is not documented anywhere I could find
# in the automake Info file) that if you define, instead, variables with
# names like "man{section}_MANS", automake will infer that the names in
# those variables are the names of man pages to be installed in section
# "{section}".
#
# So, as all our man pages go in section 1, we define "man1_MANS" to
# contain all the man page.
#
# *However*, if "man_MANS" isn't defined at all, automake concludes that
# there are no man pages, the fact that, say, "man1_MANS" is defined
# nonwithstanding! (I suspect this is the result of a mistaken attempt
# to get people to fix their automake files not to use "MANS"; if "MANS"
# is defined, it prints a warning and sets the exit status, but doesn't
# exit, and then it just gives up if "man_MANS" isn't defined,
# presumably on the theory that the only reason it wouldn't be defined
# is because the automake file uses the obsolete "MANS" variable instead
# of the shiny new "man_MANS" variable.)
#
# So we also define "man_MANS", but don't define it as anything;
# automake will arrange that the Makefile define it as the union of all
# the "man{section}_MANS" variables.
#
man1_MANS = \
@wireshark_man@ \
@tshark_man@ \
@text2pcap_man@ \
@mergecap_man@ \
@capinfos_man@ \
@editcap_man@ \
@dumpcap_man@ \
@idl2wrs_man@ \
@rawshark_man@
man4_MANS = @wiresharkfilter_man@
man_MANS =
../ws.css: ../docbook/ws.css
cp ../docbook/ws.css ../
pkgdata_DATA = AUTHORS-SHORT $(top_srcdir)/docbook/ws.css wireshark.html \
tshark.html wireshark-filter.html capinfos.html editcap.html \
idl2wrs.html mergecap.html text2pcap.html dumpcap.html rawshark.html
../wireshark.1: wireshark-tmp.pod ../config.h
#
# Build the short version of the authors file for the about dialog
#
AUTHORS-SHORT: $(top_srcdir)/AUTHORS $(srcdir)/make-authors-short.pl
$(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-short.pl < $(top_srcdir)/AUTHORS > AUTHORS-SHORT
#
# Build the short version of the authors file with formatting codes for the
# man page
#
AUTHORS-SHORT-FORMAT: AUTHORS-SHORT $(srcdir)/make-authors-format.pl
$(PERL) $(srcdir)/perlnoutf.pl $(srcdir)/make-authors-format.pl < AUTHORS-SHORT > AUTHORS-SHORT-FORMAT
wireshark-tmp.pod: $(srcdir)/wireshark.pod AUTHORS-SHORT-FORMAT
cat $(srcdir)/wireshark.pod AUTHORS-SHORT-FORMAT > wireshark-tmp.pod
wireshark.1: wireshark-tmp.pod ../config.h
$(POD2MAN) \
--center="The Wireshark Network Analyzer" \
--release=$(VERSION) \
wireshark-tmp.pod | sed 's/WIRESHARK-TMP/WIRESHARK/' > ../wireshark.1
wireshark-tmp.pod | sed 's/WIRESHARK-TMP/WIRESHARK/' > wireshark.1
../wireshark.html: wireshark-tmp.pod ../config.h ../ws.css
wireshark.html: wireshark-tmp.pod ../config.h $(top_srcdir)/docbook/ws.css
$(POD2HTML) \
--title="The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--css=$(top_srcdir)/docbook/ws.css \
--noindex \
wireshark-tmp.pod > ../wireshark.html
wireshark-tmp.pod > wireshark.html
../tshark.1: tshark.pod ../config.h
tshark.1: tshark.pod ../config.h
$(POD2MAN) \
--center="The Wireshark Network Analyzer" \
--release=$(VERSION) \
$(srcdir)/tshark.pod > ../tshark.1
$(srcdir)/tshark.pod > tshark.1
../tshark.html: tshark.pod ../config.h ../ws.css
tshark.html: tshark.pod ../config.h $(top_srcdir)/docbook/ws.css
$(POD2HTML) \
--title="tshark - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--css=$(top_srcdir)/docbook/ws.css \
--noindex \
$(srcdir)/tshark.pod > ../tshark.html
$(srcdir)/tshark.pod > tshark.html
../wireshark-filter.4: wireshark-filter.pod ../config.h
wireshark-filter.4: wireshark-filter.pod ../config.h
$(POD2MAN) \
--section=4 \
--center="The Wireshark Network Analyzer" \
--release=$(VERSION) \
wireshark-filter.pod > ../wireshark-filter.4
wireshark-filter.pod > wireshark-filter.4
../wireshark-filter.html: wireshark-filter.pod ../config.h ../ws.css
wireshark-filter.html: wireshark-filter.pod ../config.h $(top_srcdir)/docbook/ws.css
$(POD2HTML) \
--title="wireshark-filter - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--css=$(top_srcdir)/docbook/ws.css \
--noindex \
wireshark-filter.pod > ../wireshark-filter.html
wireshark-filter.pod > wireshark-filter.html
wireshark-filter.pod: wireshark-filter.pod.template ../tshark
WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 ../tshark -G fields | $(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/wireshark-filter.pod.template > wireshark-filter.pod
WIRESHARK_RUN_FROM_BUILD_DIRECTORY=1 ../tshark -G fields | \
$(PERL) $(srcdir)/dfilter2pod.pl $(srcdir)/wireshark-filter.pod.template > wireshark-filter.pod
../capinfos.1: capinfos.pod ../config.h
capinfos.1: capinfos.pod ../config.h
$(POD2MAN) \
--center="The Wireshark Network Analyzer" \
--release=$(VERSION) \
$(srcdir)/capinfos.pod > ../capinfos.1
$(srcdir)/capinfos.pod > capinfos.1
../capinfos.html: capinfos.pod ../config.h ../ws.css
capinfos.html: capinfos.pod ../config.h $(top_srcdir)/docbook/ws.css
$(POD2HTML) \
--title="capinfos - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--css=$(top_srcdir)/docbook/ws.css \
--noindex \
$(srcdir)/capinfos.pod > ../capinfos.html
$(srcdir)/capinfos.pod > capinfos.html
../editcap.1: editcap.pod ../config.h
editcap.1: editcap.pod ../config.h
$(POD2MAN) \
--center="The Wireshark Network Analyzer" \
--release=$(VERSION) \
$(srcdir)/editcap.pod > ../editcap.1
$(srcdir)/editcap.pod > editcap.1
../editcap.html: editcap.pod ../config.h ../ws.css
editcap.html: editcap.pod ../config.h $(top_srcdir)/docbook/ws.css
$(POD2HTML) \
--title="editcap - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--css=$(top_srcdir)/docbook/ws.css \
--noindex \
$(srcdir)/editcap.pod > ../editcap.html
$(srcdir)/editcap.pod > editcap.html
../idl2wrs.1: idl2wrs.pod ../config.h
idl2wrs.1: idl2wrs.pod ../config.h
$(POD2MAN) \
--center="The Wireshark Network Analyzer" \
--release=$(VERSION) \
$(srcdir)/idl2wrs.pod > ../idl2wrs.1
$(srcdir)/idl2wrs.pod > idl2wrs.1
../idl2wrs.html: idl2wrs.pod ../config.h ../ws.css
idl2wrs.html: idl2wrs.pod ../config.h $(top_srcdir)/docbook/ws.css
$(POD2HTML) \
--title="idl2wrs - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--css=$(top_srcdir)/docbook/ws.css \
--noindex \
$(srcdir)/idl2wrs.pod > ../idl2wrs.html
$(srcdir)/idl2wrs.pod > idl2wrs.html
../mergecap.1: mergecap.pod ../config.h
mergecap.1: mergecap.pod ../config.h
$(POD2MAN) \
--center="The Wireshark Network Analyzer" \
--release=$(VERSION) \
$(srcdir)/mergecap.pod > ../mergecap.1
$(srcdir)/mergecap.pod > mergecap.1
../mergecap.html: mergecap.pod ../config.h ../ws.css
mergecap.html: mergecap.pod ../config.h $(top_srcdir)/docbook/ws.css
$(POD2HTML) \
--title="mergecap - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--css=$(top_srcdir)/docbook/ws.css \
--noindex \
$(srcdir)/mergecap.pod > ../mergecap.html
$(srcdir)/mergecap.pod > mergecap.html
../text2pcap.1: text2pcap.pod ../config.h
text2pcap.1: text2pcap.pod ../config.h
$(POD2MAN) \
--center="The Wireshark Network Analyzer" \
--release=$(VERSION) \
$(srcdir)/text2pcap.pod > ../text2pcap.1
$(srcdir)/text2pcap.pod > text2pcap.1
../text2pcap.html: text2pcap.pod ../config.h ../ws.css
text2pcap.html: text2pcap.pod ../config.h $(top_srcdir)/docbook/ws.css
$(POD2HTML) \
--title="text2pcap - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--css=$(top_srcdir)/docbook/ws.css \
--noindex \
$(srcdir)/text2pcap.pod > ../text2pcap.html
$(srcdir)/text2pcap.pod > text2pcap.html
../dumpcap.1: dumpcap.pod ../config.h
dumpcap.1: dumpcap.pod ../config.h
$(POD2MAN) \
--center="The Wireshark Network Analyzer" \
--release=$(VERSION) \
$(srcdir)/dumpcap.pod > ../dumpcap.1
$(srcdir)/dumpcap.pod > dumpcap.1
../dumpcap.html: dumpcap.pod ../config.h ../ws.css
dumpcap.html: dumpcap.pod ../config.h $(top_srcdir)/docbook/ws.css
$(POD2HTML) \
--title="dumpcap - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--css=$(top_srcdir)/docbook/ws.css \
--noindex \
$(srcdir)/dumpcap.pod > ../dumpcap.html
$(srcdir)/dumpcap.pod > dumpcap.html
../rawshark.1: rawshark.pod ../config.h
rawshark.1: rawshark.pod ../config.h
$(POD2MAN) \
--center="The Wireshark Network Analyzer" \
--release=$(VERSION) \
$(srcdir)/rawshark.pod > ../rawshark.1
$(srcdir)/rawshark.pod > rawshark.1
../rawshark.html: rawshark.pod ../config.h ../ws.css
rawshark.html: rawshark.pod ../config.h $(top_srcdir)/docbook/ws.css
$(POD2HTML) \
--title="rawshark - The Wireshark Network Analyzer $(VERSION)" \
--css=ws.css \
--css=$(top_srcdir)/docbook/ws.css \
--noindex \
$(srcdir)/rawshark.pod > ../rawshark.html
$(srcdir)/rawshark.pod > rawshark.html
CLEANFILES = \
wireshark-filter.pod \
wireshark-tmp.pod \
../wireshark-filter.4 \
../wireshark-filter.html \
../wireshark.1 \
../wireshark.html \
../capinfos.1 \
../capinfos.html \
../editcap.1 \
../editcap.html \
../mergecap.1 \
../mergecap.html \
../tshark.1 \
../tshark.html \
../text2pcap.1 \
../text2pcap.html \
../dumpcap.1 \
../dumpcap.html \
../idl2wrs.1 \
../idl2wrs.html \
../rawshark.1 \
../rawshark.html
wireshark-filter.4 \
wireshark-filter.html \
wireshark.1 \
wireshark.html \
capinfos.1 \
capinfos.html \
editcap.1 \
editcap.html \
mergecap.1 \
mergecap.html \
tshark.1 \
tshark.html \
text2pcap.1 \
text2pcap.html \
dumpcap.1 \
dumpcap.html \
idl2wrs.1 \
idl2wrs.html \
rawshark.1 \
rawshark.html
DISTCLEANFILES = \
pod2htmi.tmp \
pod2htmd.tmp \
AUTHORS-SHORT \
AUTHORS-SHORT-FORMAT \
*~
MAINTAINERCLEANFILES = \
@ -213,6 +280,9 @@ EXTRA_DIST = \
README.stats_tree \
README.tapping \
README.xml-output \
make-authors-format.pl \
make-authors-short.pl \
perlnoutf.pl \
capinfos.pod \
dfilter2pod.pl \
dumpcap.pod \

View File

@ -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-tmp.pod: wireshark.pod AUTHORS-SHORT-FORMAT
copy /B wireshark.pod + AUTHORS-SHORT-FORMAT wireshark-tmp.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 .
@ -200,6 +208,7 @@ clean:
rm -f rawshark.html rawshark.1
rm -f pod2htm*
rm -f ws.css
rm -f AUTHORS-SHORT AUTHORS-SHORT-FORMAT
distclean: clean