aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2013-04-30 00:27:02 +0000
committerGerald Combs <gerald@wireshark.org>2013-04-30 00:27:02 +0000
commit9120bf883e8c093f1298c20d65fc1560d9162ce3 (patch)
tree7668a21e92d486de3bee790a591e497a4946a123 /Makefile.am
parent160af640582cb895f1ad581e7d3f38c8225b15d0 (diff)
Move the contents of wsar_html/core to wsar_html. Create tag files for
core, epan, and ui, and link them to each other to varying degrees. This seems to be the best way to organize our documentation. The alternative is to switch to a single doxygen.cfg and manually add files to different groups or sections. Add a wireshark.dox file which contains markup for the main page. Add .dox and .txt to svnadd. Clean up our tag files. Force wsar_html to rebuild each time. svn path=/trunk/; revision=49091
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am6
1 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index d41a542d08..5b16135d82 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -570,6 +570,7 @@ services:
CLEANFILES = \
*~ \
+ doxygen-core.tag \
vgcore.*
#
@@ -1151,11 +1152,12 @@ checkapi: checkapi_local
cd plugins && $(MAKE) checkapi
cd wsutil && $(MAKE) checkapi
-wsar_html: doxygen.cfg doxygen_global.cfg
+wsar_html: doxygen.cfg doxygen_global.cfg FORCE
if HAVE_DOXYGEN
- (umask 022 ; $(DOXYGEN) doxygen.cfg)
+ rm -rf wsar_html
cd epan && $(MAKE) $@
cd ui && $(MAKE) $@
+ (umask 022 ; $(DOXYGEN) doxygen.cfg)
endif
wsar-zip: wsar_html