Skip to content
Snippets Groups Projects
Commit cf2458f2 authored by Markus Blatt's avatar Markus Blatt
Browse files

Fixed bug that cleaned generated files from the tarballs.

The trick is to test for doc/doxygen/Doxydep which is only there in
the svn tree!

[[Imported from SVN: r4960]]
parent 98a883ae
No related branches found
No related tags found
No related merge requests found
......@@ -27,7 +27,9 @@ EXTRA_DIST = $(PAGES) example.opts
include $(top_srcdir)/am/webstuff
# remove html pages on ``make clean''
CLEANFILES = $(PAGES)
SVNCLEANFILES = $(PAGES)
clean-local:
if test -e $(top_srcdir)/doc/doxygen/Doxydep; then rm -rf $(SVNCLEANFILES); fi
# include further rules needed by Dune
include $(top_srcdir)/am/global-rules
......@@ -25,7 +25,12 @@ include $(top_srcdir)/am/webstuff
include $(top_srcdir)/am/latex
# remove html pages on ``make clean''
CLEANFILES = *.ps *.pdf auto *.aux *.dvi *.log *.out *.toc
CLEANFILES = auto *.aux *.dvi *.log *.out *.toc
# PDFs and PSs are only clean in svn version not in the tarballs
SVNCLEANFILES = *.pdf *.ps
clean-local:
if test -e $(top_srcdir)/$(CURDIR)/doxygen/Doxydep; then rm -rf $(SVNCLEANFILES) ; fi
# include further rules needed by Dune
include $(top_srcdir)/am/global-rules
......@@ -18,6 +18,9 @@ EXTRA_DIST= $(PAGES)
include $(top_srcdir)/am/webstuff
CLEANFILES = $(PAGES)
# remove html pages on ``make clean'' if we are not a tarball
SVNCLEANFILES = $(PAGES)
clean-local:
if test -e $(top_srcdir)/doc/doxygen/Doxydep; then rm -rf $(SVNCLEANFILES); fi
include $(top_srcdir)/am/global-rules
......@@ -15,6 +15,7 @@ all: $(WHAT) $(DOXYGEN_HTML)
BASEDIR=../..
CURDIR=doc/doxygen
EXTRAINSTALL = doxygen.log
# EXTRAINSTALL in the html subdirectory
DOXYGENINSTALL = *.html *.css *.png *.gif
......@@ -33,7 +34,7 @@ endif
#we need this in the distribution
EXTRA_DIST = $(WHAT) $(DOXYGEN_DIST) $(DOXYGENHEADER) doxy-footer.html $(PAGES)
EXTRA_DIST = $(WHAT) html-dist $(DOXYGENHEADER) doxy-footer.html $(PAGES)
doxygendir = $(datadir)/doc/dune-common/doxygen
doxygen_DATA = $(WHAT)
......@@ -99,10 +100,13 @@ FORCE:
include $(top_srcdir)/am/webstuff
# file to clean only in svn and not in tarball tree
SVNCLEANFILES = html html-dist $(WHAT) $(DOXYGENHEADER)
clean-local:
if test -e Doxydep; then rm -rf html html-dist; fi
if test -e $(top_srcdir)/doc/doxygen/Doxydep; then rm -rf $(SVNCLEANFILES);fi
rm -rf latex *~
CLEANFILES = $(WHAT) $(DOXYGENTAG) $(DOXYGENHEADER)
CLEANFILES = $(DOXYGENTAG)
include $(top_srcdir)/am/global-rules
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment