diff options
Diffstat (limited to 'reproduce')
| -rw-r--r-- | reproduce/analysis/make/paper.mk | 13 | ||||
| -rw-r--r-- | reproduce/software/config/texlive-packages.conf | 31 | ||||
| -rw-r--r-- | reproduce/software/make/high-level.mk | 7 |
3 files changed, 21 insertions, 30 deletions
diff --git a/reproduce/analysis/make/paper.mk b/reproduce/analysis/make/paper.mk index b1b794c..e6a91de 100644 --- a/reproduce/analysis/make/paper.mk +++ b/reproduce/analysis/make/paper.mk @@ -156,6 +156,16 @@ $(texbdir)/paper.bbl: tex/src/references.tex $(mtexdir)/dependencies.tex \ # will be built anyway once this rule is done. rm -f $@ +# Copy the A&A BibTeX style. + ln -sf $$p/tex/src/journal/aa.bst \ + $$p/tex/src/journal/linenoaa.sty ./ + +# Fill the 'references.bib' (in Maneage, the software dependencies +# are in 'tex/build/macros/dependencies-bib.tex' + cat $$p/tex/src/references.tex \ + $$p/tex/build/macros/dependencies-bib.tex > references.bib + + # The pdflatex option '-shell-escape' is "normally disallowed for # security reasons" according to the 'info pdflatex' manual, but is # enabled here in order to allow the use of PGFPlots. If you do not @@ -168,7 +178,8 @@ $(texbdir)/paper.bbl: tex/src/references.tex $(mtexdir)/dependencies.tex \ # possible system-wide things). export LD_LIBRARY_PATH="$(sys_library_sh_path):$$LD_LIBRARY_PATH" pdflatex -shell-escape -halt-on-error "$$p"/paper.tex - biber paper + bibtex paper + pdflatex -shell-escape -halt-on-error "$$p"/paper.tex fi diff --git a/reproduce/software/config/texlive-packages.conf b/reproduce/software/config/texlive-packages.conf index e68a771..d25309a 100644 --- a/reproduce/software/config/texlive-packages.conf +++ b/reproduce/software/config/texlive-packages.conf @@ -26,32 +26,13 @@ # their versions. # # - fancyvrb: needed by R. -texlive-packages = biber \ - biblatex \ - caption \ - courier \ - csquotes \ - datetime \ - fancyvrb \ - fmtcount \ - fontaxes \ - footmisc \ - fp \ - kastrup \ - logreq \ - mweights \ - newtx \ +texlive-packages = caption \ + helvetic \ + lineno \ pgf \ pgfplots \ - preprint \ setspace \ - tex-gyre \ + sttools \ + tex \ times \ - titlesec \ - trimspaces \ - txfonts \ - ulem \ - xcolor \ - xkeyval \ - xpatch \ - xstring + txfonts diff --git a/reproduce/software/make/high-level.mk b/reproduce/software/make/high-level.mk index 67ca8b6..ecb60de 100644 --- a/reproduce/software/make/high-level.mk +++ b/reproduce/software/make/high-level.mk @@ -444,6 +444,7 @@ $(ibidir)/cfitsio-$(cfitsio-version): # # Note that older versions of CFITSIO (before 4.4.0) require a # specific 'shared' target for the building of the shared libraries. + export CFLAGS="-std=gnu17 $$CFLAGS" export gbuild_tar=$(ddir)/$$customtar $(call gbuild, cfitsio-$(cfitsio-version), , \ --enable-sse2 --enable-reentrant \ @@ -1198,8 +1199,8 @@ $(ibidir)/ghostscript-$(ghostscript-version): \ --enable-dynamic \ --disable-compile-inits \ --disable-hidden-visibility \ - CFLAGS="-DPNG_ARM_NEON_OPT=0" \ - LDFLAGS=-Wl,--copy-dt-needed-entries + LDFLAGS=-Wl,--copy-dt-needed-entries \ + CFLAGS="-DPNG_ARM_NEON_OPT=0 -std=gnu17" # Build and install the program and the shared libraries. make V=1 -j$(numthreads) @@ -1229,7 +1230,6 @@ $(ibidir)/gnuastro-$(gnuastro-version): \ $(ibidir)/wcslib-$(wcslib-version) \ $(ibidir)/libjpeg-$(libjpeg-version) \ $(ibidir)/libtiff-$(libtiff-version) \ - $(ibidir)/libgit2-$(libgit2-version) \ $(ibidir)/ghostscript-$(ghostscript-version) tarball=gnuastro-$(gnuastro-version).tar.lz $(call import-source, $(gnuastro-url), $(gnuastro-checksum)) @@ -1865,7 +1865,6 @@ $(ibidir)/zip-$(zip-version): $(ibidir)/gzip-$(gzip-version) # NY on the internet infrastructure). texlive-url=http://mirrors.rit.edu/CTAN/systems/texlive/tlnet $(itidir)/texlive-ready-tlmgr: reproduce/software/config/texlive.conf - tarball=install-tl-unx.tar.gz $(call import-source, $(texlive-url), NO-CHECK-SUM) |