diff --git a/Makefile b/Makefile index 5568582..6faa0ff 100644 --- a/Makefile +++ b/Makefile @@ -52,8 +52,8 @@ $(distdir): $(qmckl_h) $(qmckl_f) $(static_lib) $(shared_lib) src/Makefile.gener FORCE: - - rm -- $(distdir).tar.gz >/dev/null 2>&1 - - rm -rf -- $(distdir) >/dev/null 2>&1 + rm -f -- $(distdir).tar.gz + rm -rf -- $(distdir) distcheck: $(distdir).tar.gz diff --git a/src/Makefile b/src/Makefile index abad9d4..e48cc2c 100644 --- a/src/Makefile +++ b/src/Makefile @@ -116,7 +116,11 @@ clean: - $(RM) test_qmckl_* test_qmckl.c \ $(qmckl_h) $(qmckl_f) \ qmckl_*.f90 qmckl_*.c qmckl_*.h \ - Makefile.generated *.html + Makefile.generated *.html *.txt + +veryclean: clean FORCE + - $(RM) $(QMCKL_ROOT)/docs/*.html \ + $(QMCKL_ROOT)/docs/*.txt Makefile.generated: Makefile $(QMCKL_ROOT)/tools/create_makefile.sh $(ORG_SOURCE_FILES) $(QMCKL_ROOT)/tools/create_makefile.sh diff --git a/tools/Building.org b/tools/Building.org index 69fd55f..d1042a7 100644 --- a/tools/Building.org +++ b/tools/Building.org @@ -188,7 +188,11 @@ clean: - $(RM) test_qmckl_* test_qmckl.c \ $(qmckl_h) $(qmckl_f) \ qmckl_*.f90 qmckl_*.c qmckl_*.h \ - Makefile.generated *.html + Makefile.generated *.html *.txt + +veryclean: clean FORCE + - $(RM) $(QMCKL_ROOT)/docs/*.html \ + $(QMCKL_ROOT)/docs/*.txt Makefile.generated: Makefile $(QMCKL_ROOT)/tools/create_makefile.sh $(ORG_SOURCE_FILES) $(QMCKL_ROOT)/tools/create_makefile.sh @@ -559,6 +563,7 @@ function extract_doc() { local org=$1 local local_html=${SRC}/${org%.org}.html + local local_text=${SRC}/${org%.org}.txt local html=${DOCS}/${org%.org}.html if [[ -f ${html} && ${org} -ot ${html} ]] @@ -570,8 +575,9 @@ function extract_doc() --load ${CONFIG_DOC} \ ${org} \ --load ${CONFIG_TANGLE} \ - -f org-html-export-to-html - mv ${local_html} ${DOCS} + -f org-html-export-to-html \ + -f org-ascii-export-to-ascii + mv ${local_html} ${local_text} ${DOCS} } #+end_src diff --git a/tools/build_doc.sh b/tools/build_doc.sh index 7b91389..7de7111 100755 --- a/tools/build_doc.sh +++ b/tools/build_doc.sh @@ -78,6 +78,7 @@ function extract_doc() { local org=$1 local local_html=${SRC}/${org%.org}.html + local local_text=${SRC}/${org%.org}.txt local html=${DOCS}/${org%.org}.html if [[ -f ${html} && ${org} -ot ${html} ]] @@ -89,8 +90,9 @@ function extract_doc() --load ${CONFIG_DOC} \ ${org} \ --load ${CONFIG_TANGLE} \ - -f org-html-export-to-html - mv ${local_html} ${DOCS} + -f org-html-export-to-html \ + -f org-ascii-export-to-ascii + mv ${local_html} ${local_text} ${DOCS} }