summaryrefslogtreecommitdiff
path: root/makefiles
diff options
context:
space:
mode:
authorVincent Sanders <vince@kyllikki.org>2015-06-24 16:47:32 +0100
committerVincent Sanders <vince@kyllikki.org>2015-06-24 16:47:32 +0100
commit92a9156ac26570480205425012fe708431d48a13 (patch)
tree7d4bc8a0b5c42236b33a0625a36101feddfe9c07 /makefiles
parent6548d564fd75795806ee9f9e7c6abaa43e56cdf5 (diff)
downloadbuildsystem-92a9156ac26570480205425012fe708431d48a13.tar.gz
buildsystem-92a9156ac26570480205425012fe708431d48a13.tar.bz2
Update documentation generation
Diffstat (limited to 'makefiles')
-rw-r--r--makefiles/Makefile.tools6
-rw-r--r--makefiles/Makefile.top6
2 files changed, 8 insertions, 4 deletions
diff --git a/makefiles/Makefile.tools b/makefiles/Makefile.tools
index 74bc17f..d74b64b 100644
--- a/makefiles/Makefile.tools
+++ b/makefiles/Makefile.tools
@@ -437,6 +437,12 @@ ifeq ($(COMPONENT_TYPE),lib-shared)
endif
################################################################################
+# Documentation defaults
+################################################################################
+
+DOXYCONF ?= docs/Doxyfile
+
+################################################################################
# Package config macros
################################################################################
diff --git a/makefiles/Makefile.top b/makefiles/Makefile.top
index 07d3373..9d3c680 100644
--- a/makefiles/Makefile.top
+++ b/makefiles/Makefile.top
@@ -115,7 +115,6 @@ BUILDDIR ?= build-$(BUILD)-$(HOST)-$(VARIANT)-$(COMPONENT_TYPE)
# Build tree subdirs
COVERAGEDIR := $(BUILDDIR)/coverage
-DOCDIR := $(BUILDDIR)/docs
# Determine if we want to build testcases
ifeq ($(MAKECMDGOALS),test)
@@ -236,8 +235,8 @@ coverage: __precov test
profile: __partial_clean test
# Compile documentation
-docs: $(BUILDDIR)/stamp
- $(Q)$(DOXYGEN) build/Doxyfile
+docs: $(DOXYCONF) $(BUILDDIR)/stamp
+ $(Q)$(DOXYGEN) $<
# Distribution
# This constructs a distribution tar from the last git tag. It ensures
@@ -393,7 +392,6 @@ uninstall:
$(BUILDDIR)/stamp:
$(Q)$(MKDIR) $(MKDIRFLAGS) $(BUILDDIR)
$(Q)$(MKDIR) $(MKDIRFLAGS) $(COVERAGEDIR)
- $(Q)$(MKDIR) $(MKDIRFLAGS) $(DOCDIR)
$(Q)$(TOUCH) $(TOUCHFLAGS) $(BUILDDIR)/stamp
$(OUTPUT): $(BUILDDIR)/stamp $(OBJECTS)