ea40f6d9b5
Drop patches accepted upstream Drop previously backported patches Unbundle jsroot in root-net-http Add hack to work around broken charmaps in StandardSymbolsPS.otf Use local static script and style files for JupyROOT Fix some javascript errors Fix build rules for test binaries so that they are not installed Address memory usage issue for ARM build Drop pre-minified javascript and style files (Fedora packaging guidelines) Enable builds on ppc/ppc64/ppc64le (do not pass all tests, but the list of failing tests is much shorter with this release) Add dependency on python[23]-jsmva to python[23]-jupyroot New sub-packages: root-gui-canvaspainter, root-gui-webdisplay and root-hist-draw (not for EPEL 7 since they are root7 specific and require c++-14)
28 lines
1.3 KiB
Diff
28 lines
1.3 KiB
Diff
diff --git a/documentation/doxygen/Makefile b/documentation/doxygen/Makefile
|
|
index 4e6b47728d..a886c1b729 100644
|
|
--- a/documentation/doxygen/Makefile
|
|
+++ b/documentation/doxygen/Makefile
|
|
@@ -8,7 +8,6 @@ export DOXYGEN_ROOT_VERSION := $(shell root -l -b -q -e 'printf("%s\n", gROOT->G
|
|
export DOXYGEN_EXAMPLE_PATH := $(DOXYGEN_OUTPUT_DIRECTORY)/macros
|
|
export DOXYGEN_IMAGE_PATH := $(DOXYGEN_OUTPUT_DIRECTORY)/html
|
|
export DOXYGEN_NOTEBOOK_PATH := $(DOXYGEN_OUTPUT_DIRECTORY)/notebooks
|
|
-export DOXYGEN_NOTEBOOK_PATH_PARALLEL := $(DOXYGEN_NOTEBOOK_PATH)/parallel
|
|
export DOXYGEN_STRIP_PATH := $(shell cd $(PWD)/../..; pwd)
|
|
export DOXYGEN_INCLUDE_PATH := $(shell find $(DOXYGEN_STRIP_PATH) -type d -name dictpch -prune -o -type d -name inc)
|
|
|
|
@@ -33,14 +32,11 @@ doxygen: filter
|
|
$(call MkDir,$(DOXYGEN_OUTPUT_DIRECTORY))
|
|
$(call MkDir,$(DOXYGEN_EXAMPLE_PATH))
|
|
$(call MkDir,$(DOXYGEN_NOTEBOOK_PATH))
|
|
- $(call MkDir,$(DOXYGEN_NOTEBOOK_PATH_PARALLEL))
|
|
- time python ./parallelNotebooks.py
|
|
./makehtmlfooter.sh > htmlfooter.html
|
|
doxygen
|
|
./listlibs.sh
|
|
rm -rf files c1* *.ps *.png *.svg *.pdf *.root *.xpm *.out *.dat *.dtd *.dot *.txt listofclass.sh
|
|
- rm $(DOXYGEN_NOTEBOOK_PATH)/*.root
|
|
- rm $(DOXYGEN_NOTEBOOK_PATH_PARALLEL)/*.root
|
|
+ rm -f $(DOXYGEN_NOTEBOOK_PATH)/*.root
|
|
|
|
clean:
|
|
rm -r $(DOXYGEN_OUTPUT_DIRECTORY) filter htmlfooter.html dataset*
|