[svn:parrot] r37071 - trunk/config/gen/makefiles

[fperrad at svn.parrot.org]

Author: fperrad
Date: Mon Mar  2 09:29:16 2009
New Revision: 37071
URL: https://trac.parrot.org/parrot/changeset/37071

Log:
[chm] add target htmlhelp

Modified:
   trunk/config/gen/makefiles/docs.in
   trunk/config/gen/makefiles/root.in

Modified: trunk/config/gen/makefiles/docs.in
==============================================================================
--- trunk/config/gen/makefiles/docs.in	Mon Mar  2 07:39:57 2009	(r37070)
+++ trunk/config/gen/makefiles/docs.in	Mon Mar  2 09:29:16 2009	(r37071)
@@ -6,6 +6,7 @@
 CHMOD   := @chmod@
 MKPATH  := @mkpath@
 RM_F    := @rm_f@
+RM_RF   := @rm_rf@
 PERLDOC := @perldoc@
 
 # long list of .pod files
@@ -45,7 +46,7 @@
 	$(PERL) -I../lib ../tools/docs/write_docs.pl --silent
 
 html-clean:
-	$(PERL) -I../lib -MParrot::Distribution -e "Parrot::Distribution->new()->delete_html_docs()"
+	$(RM_RF) html
 
 BOOK:= \
   ch01_overview.pod \
@@ -70,11 +71,11 @@
 book-clean:
 	$(RM_F) "book/*.html"
 
-chm:
+htmlhelp: book html
 #IF(win32):	cd .. && $(PERL) tools/docs/mk_chm.pl
 #IF(win32):	-cd html && hhc parrot.hhp
 
-chm-clean:
+htmlhelp-clean:
 #IF(win32):	$(RM_F) "html/*.hhc" "html/*.hhk" "html/*.hhp" "html/*.chm"
 
 @TEMP_pod_build@

Modified: trunk/config/gen/makefiles/root.in
==============================================================================
--- trunk/config/gen/makefiles/root.in	Mon Mar  2 07:39:57 2009	(r37070)
+++ trunk/config/gen/makefiles/root.in	Mon Mar  2 09:29:16 2009	(r37071)
@@ -657,6 +657,7 @@
 	@echo "  docs:              Generate documentation from POD in the sources."
 	@echo "  html:              Generate HTML documentation from POD in the sources."
 	@echo "  html-clean:        Remove the HTML documentation."
+	@echo "  htmlhelp:          Compile HTML documentation (CHM format)."
 	@echo ""
 	@echo "Testing:"
 	@echo "  test:              Run the standard test suite."
@@ -1273,12 +1274,6 @@
 #IF(has_perldoc):docs : docs.dummy
 #ELSE:docs : docs.stub
 
-#IF(has_perldoc):html : html.dummy
-#ELSE:html : html.stub
-
-html.stub:
-	@echo "Perldoc is required, but not detected."
-
 docs.stub:
 	@echo "Perldoc is required, but not detected."
 
@@ -1288,12 +1283,30 @@
 docs-clean :
 	$(MAKE) docs clean
 
+#IF(has_perldoc):html : html.dummy
+#ELSE:html : html.stub
+
+html.stub:
+	@echo "Perldoc is required, but not detected."
+
 html.dummy :
 	$(MAKE) docs html
 
 html-clean :
 	$(MAKE) docs html-clean
 
+#IF(has_perldoc):htmlhelp : htmlhelp.dummy
+#ELSE:htmlhelp : htmlhelp.stub
+
+htmlhelp.stub:
+	@echo "Perldoc is required, but not detected."
+
+htmlhelp.dummy :
+	$(MAKE) docs htmlhelp
+
+htmlhelp-clean :
+	$(MAKE) docs htmlhelp-clean
+
 ###############################################################################
 #
 # dynamic PMC targets: