Commit bb25fb47 authored by Anton Kokalj's avatar Anton Kokalj

Merge branch 'develop' into 'develop'

A few more changes so that "make gui" creates a functional PWgui.

See merge request !368
parents 21d5ff92 af580b58
......@@ -21,43 +21,51 @@ clean:
- rm -f INPUT_*.html INPUT_*.txt INPUT_*.xml qe-input-ref.html
developer_man: developer_man.pdf
rm -rf developer_man/
latex2html \
- rm -rf developer_man/
- latex2html \
-t "Developer's Manual for Quantum-ESPRESSO" \
-html_version 3.2,math \
-toc_depth 3 -split 3 -toc_stars -show_section_numbers \
-local_icons -image_type png \
developer_man.tex
cd developer_man; \
for file in *.html; do \
cp $$file /tmp/$$file; \
cat /tmp/$$file | sed 's/HREF="http/NAME="http/g' | sed 's/mathend000#//g' - > $$file; \
rm -f /tmp/$$file; \
done
@echo ""
@echo "***"
@echo "*** Developer's Manual created in developers_manual/developers_manual.html"
@echo "***"
@echo ""
if test -d developer_man; then \
cd developer_man; \
for file in *.html; do \
cp $$file /tmp/$$file; \
cat /tmp/$$file | sed 's/HREF="http/NAME="http/g' | sed 's/mathend000#//g' - > $$file; \
rm -f /tmp/$$file; \
done; \
fi
@if test -d developer_man; then \
echo ""; \
echo "***"; \
echo "*** Developer's Manual created in developers_manual/developers_manual.html"; \
echo "***"; \
echo ""; \
fi
user_guide: user_guide.pdf
rm -rf user_guide/
latex2html \
- rm -rf user_guide/
- latex2html \
-t "User's Guide for Quantum-ESPRESSO" \
-html_version 3.2,math \
-toc_depth 5 -split 5 -toc_stars -show_section_numbers \
-local_icons -image_type png \
user_guide.tex
cd user_guide; \
for file in *.html; do \
cp $$file /tmp/$$file; \
cat /tmp/$$file | sed 's/HREF="http/NAME="http/g' | sed 's/mathend000#//g' - > $$file; \
rm -f /tmp/$$file; \
done
@echo ""
@echo "***"
@echo "*** User's Guide created in user_guide/user_guide.html"
@echo "***"
@echo ""
if test -d user_guide; then \
cd user_guide; \
for file in *.html; do \
cp $$file /tmp/$$file; \
cat /tmp/$$file | sed 's/HREF="http/NAME="http/g' | sed 's/mathend000#//g' - > $$file; \
rm -f /tmp/$$file; \
done; \
fi
@if test -d user_guide; then \
echo ""; \
echo "***"; \
echo "*** User's Guide created in user_guide/user_guide.html"; \
echo "***"; \
echo ""; \
fi
brillouin_zones: brillouin_zones.pdf
......@@ -3,8 +3,13 @@ sinclude ../make.inc
# do nothing by default !!!
default:
clean:
- if test -d PWgui ; then ( cd PWgui; $(MAKE) clean ) ; fi
- if test -d QE-modes ; then ( cd QE-modes; $(MAKE) clean ) ; fi
veryclean:
- if test -d Guib ; then ( cd Guib; $(MAKE) veryclean ) ; fi
- if test -d PWgui ; then ( cd PWgui; $(MAKE) distclean ) ; fi
- if test -d QE-modes ; then ( cd QE-modes; $(MAKE) veryclean ) ; fi
distclean: veryclean
......@@ -68,6 +68,7 @@ clean:
-rm -f *~ */*~ */*/*~
-rm -f *.tgz
-rm -f *.tar
-cd doc/pwdocs; $(MAKE) clean
veryclean:
$(MAKE) clean
......
......@@ -19,7 +19,7 @@ all: input_html make_user_guide
links:
( cd $(TOPDIR); $(MAKE) doc )
- ( cd $(TOPDIR); $(MAKE) doc )
for file in $(LINK_FILES); do \
if test ! -f $$file; then ln -sf $(QE_DOC_DIR)/$$file . ; fi; \
done
......@@ -52,7 +52,7 @@ make_user_guide: links
clean: clean_links
-rm -f INPUT_*.html *~
-rm -f INPUT_*.html INPUT_*.txt *~
-rm -f *.tex *.aux *.log *.out *.toc *.gif *.pdf *.png
-rm -rf user_guide/
......
......@@ -108,10 +108,12 @@ $gui addModule module ld "LD1.X" [file join $env(PWGUI) modules atomic atomic.tc
# ------------------------------------------------------------------------
# help Files
# ------------------------------------------------------------------------
#$gui addHelp help usersguide "User's Guide for Quantum-ESPRESSO" [file join $env(PWGUI) doc pwdocs users-guide users-guide.html]
$gui addHelp help usersguide "User's Guide for Quantum-ESPRESSO" [file join $env(PWGUI) doc pwdocs user_guide user_guide.html] word
$gui addHelp separator
set user_guide_html [file join $env(PWGUI) doc pwdocs user_guide user_guide.html]
if { [file exists $user_guide_html] } {
$gui addHelp help usersguide "User's Guide for Quantum-ESPRESSO" $user_guide_html word
$gui addHelp separator
}
$gui addHelp help pw "PW.X Input Syntax" [file join $env(PWGUI) doc pwdocs INPUT_PW.html] none
$gui addHelp help neb "NEB.DAT Input Syntax" [file join $env(PWGUI) doc pwdocs INPUT_NEB.html] none
......
......@@ -98,7 +98,6 @@ doc:
cd Doc; $(MAKE)
clean:
- rm -f qe-modes/$(ELISP_FILES)
- cd Doc; $(MAKE) clean
veryclean: clean
......
......@@ -321,7 +321,7 @@ clean :
CPV LAXlib FFTXlib UtilXlib Modules PP PW EPW KS_Solvers \
NEB ACFDT COUPLE GWW XSpectra PWCOND dft-d3 \
atomic clib LR_Modules pwtools upftools \
dev-tools extlibs Environ TDDFPT PHonon HP GWW \
dev-tools extlibs Environ TDDFPT PHonon HP GWW Doc GUI \
; do \
if test -d $$dir ; then \
( cd $$dir ; \
......
......@@ -10,7 +10,7 @@ OUTS = $(PDFS:.pdf=.out)
TOCS = $(PDFS:.pdf=.toc)
doc: all
all: pdf html defs
all: defs pdf html
pdf: $(PDFS)
html: user_guide
......@@ -26,7 +26,7 @@ clean:
- rm -rf ../../Doc/INPUT_NEB.*
user_guide: user_guide.pdf
rm -rf user_guide/
- rm -rf user_guide/
latex2html \
-t "User's Guide for The Quantum ESPRESSO Nudged Elastic Band" \
-html_version 3.2,math \
......
......@@ -12,7 +12,7 @@ TOCS = $(PDFS:.pdf=.toc)
doc: all
all: pdf html defs
all: defs pdf html
pdf: $(PDFS)
html: user_guide developer_man
......@@ -28,7 +28,7 @@ clean:
- rm -rf ../../Doc/INPUT_PH.*
user_guide: user_guide.pdf
rm -rf user_guide/
- rm -rf user_guide/
latex2html \
-t "User's Guide for the PHonon package" \
-html_version 3.2,math \
......
......@@ -23,7 +23,7 @@ XMLS = $(HTMLS:.html=.xml)
TXTS = $(HTMLS:.html=.txt)
doc: all
all: pdf defs html
all: defs pdf html
pdf: $(PDFS)
html: user_guide
......@@ -77,7 +77,7 @@ link_on_main_doc:
ln -fs ../PP/Doc/INPUT_molecularpdos.txt .)
user_guide: user_guide.pdf
rm -rf user_guide/
- rm -rf user_guide/
latex2html \
-t "User's Guide for the PP package" \
-html_version 3.2,math \
......
......@@ -11,7 +11,7 @@ TOCS = $(PDFS:.pdf=.toc)
doc: all
all: pdf html defs
all: defs pdf html
pdf: $(PDFS)
html: user_guide
......@@ -28,7 +28,7 @@ clean:
user_guide: user_guide.pdf
rm -rf user_guide/
- rm -rf user_guide/
latex2html \
-t "User's Guide for the PWscf package" \
-html_version 3.2,math \
......
......@@ -9,7 +9,7 @@ LOGS = $(PDFS:.pdf=.log)
OUTS = $(PDFS:.pdf=.out)
TOCS = $(PDFS:.pdf=.toc)
all: pdf html defs
all: defs pdf html
pdf: $(PDFS)
html: pseudo-gen
......@@ -25,7 +25,7 @@ clean:
- rm -rf ../../Doc/input_xx.xsl
pseudo-gen: pseudo-gen.pdf
rm -rf pseudo-gen/
- rm -rf pseudo-gen/
latex2html \
-t "User's Guide for LD1" \
-html_version 3.2,math \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment