aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMike Blumenkrantz <m.blumenkran@samsung.com>2013-07-25 09:46:14 +0100
committerMike Blumenkrantz <zmike@samsung.com>2014-01-14 20:22:01 -0500
commite3c85ec4da64ebcfb29eea0992466730e3e31995 (patch)
treed576c1ecc20985ee46a4a4d75a347890814d80ed /doc
parentupdate standard config for v12 (diff)
downloadenlightenment-e3c85ec4da64ebcfb29eea0992466730e3e31995.tar.gz
feature: use non-recursive makefiles for entire build system
this is the correct way to write a build system. one toplevel Makefile.am with the rest of the directories having include Makefile.mk files. additional authors: Iván Briano <ivan.briano@intel.com>
Diffstat (limited to 'doc')
-rw-r--r--doc/Doxyfile.in12
-rw-r--r--doc/Makefile.am42
-rw-r--r--doc/Makefile.mk47
3 files changed, 53 insertions, 48 deletions
diff --git a/doc/Doxyfile.in b/doc/Doxyfile.in
index 20d2d3e81..11359d033 100644
--- a/doc/Doxyfile.in
+++ b/doc/Doxyfile.in
@@ -1,15 +1,15 @@
PROJECT_NAME = Enlightenment
PROJECT_NUMBER =
-OUTPUT_DIRECTORY = .
-INPUT = @builddir@/e.dox @top_srcdir@/src
-IMAGE_PATH = @srcdir@/img
+OUTPUT_DIRECTORY = @builddir@/doc
+INPUT = @builddir@/doc/e.dox @top_srcdir@/src
+IMAGE_PATH = @srcdir@/doc/img
OUTPUT_LANGUAGE = English
GENERATE_HTML = YES
HTML_OUTPUT = html
HTML_FILE_EXTENSION = .html
-HTML_HEADER = @srcdir@/head.html
-HTML_FOOTER = @srcdir@/foot.html
-HTML_STYLESHEET = @srcdir@/e.css
+HTML_HEADER = @srcdir@/doc/head.html
+HTML_FOOTER = @srcdir@/doc/foot.html
+HTML_STYLESHEET = @srcdir@/doc/e.css
ENUM_VALUES_PER_LINE = 1
GENERATE_HTMLHELP = NO
CHM_FILE =
diff --git a/doc/Makefile.am b/doc/Makefile.am
deleted file mode 100644
index 9c8631ea9..000000000
--- a/doc/Makefile.am
+++ /dev/null
@@ -1,42 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in e.dox
-
-.PHONY: doc
-
-PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
-
-if EFL_BUILD_DOC
-
-doc-clean:
- rm -rf html/ latex/ man/ xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
-
-doc: all doc-clean
- $(efl_doxygen)
- cp $(srcdir)/img/* html/
- rm -rf $(PACKAGE_DOCNAME).tar*
- $(MKDIR_P) $(PACKAGE_DOCNAME)/doc
- cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
- tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
- bzip2 -9 $(PACKAGE_DOCNAME).tar
- rm -rf $(PACKAGE_DOCNAME)/
- mv $(PACKAGE_DOCNAME).tar.bz2 $(top_builddir)
- @echo "Documentation Package: $(top_builddir)/$(PACKAGE_DOCNAME).tar.bz2"
-
-clean-local: doc-clean
-
-else
-
-doc:
- @echo "Documentation not built. Run ./configure --help"
-
-endif
-
-filesdir = $(datadir)/enlightenment/doc
-files_DATA = \
-documentation.html \
-illume2.html \
-FDO.txt \
-cache.txt \
-enlightenment.png \
-illume2.png
-
-EXTRA_DIST = $(files_DATA) Doxyfile.in $(wildcard img/*.*) e.css head.html foot.html e.dox.in
diff --git a/doc/Makefile.mk b/doc/Makefile.mk
new file mode 100644
index 000000000..fd49b872e
--- /dev/null
+++ b/doc/Makefile.mk
@@ -0,0 +1,47 @@
+MAINTAINERCLEANFILES += doc/e.dox
+
+PHONIES += doc doc-clean
+
+PACKAGE_DOCNAME = $(PACKAGE_TARNAME)-$(PACKAGE_VERSION)-doc
+
+if EFL_BUILD_DOC
+
+doc-clean:
+ rm -rf doc/html/ doc/latex/ doc/man/ doc/xml/ $(top_builddir)/$(PACKAGE_DOCNAME).tar*
+
+doc: all doc-clean
+ @echo "entering doc/"
+ $(efl_doxygen) doc/Doxyfile
+ cp $(top_srcdir)/doc/img/* doc/html/
+ rm -rf $(PACKAGE_DOCNAME).tar*
+ $(MKDIR_P) $(PACKAGE_DOCNAME)/doc
+ cp -R doc/html/ doc/latex/ doc/man/ $(PACKAGE_DOCNAME)/doc
+ tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
+ bzip2 -9 $(PACKAGE_DOCNAME).tar
+ rm -rf $(PACKAGE_DOCNAME)/
+ @echo "Documentation Package: $(top_builddir)/$(PACKAGE_DOCNAME).tar.bz2"
+
+else
+
+doc:
+ @echo "Documentation not built. Run ./configure --help"
+
+endif
+
+docfilesdir = $(datadir)/enlightenment/doc
+docfiles_DATA = \
+doc/documentation.html \
+doc/illume2.html \
+doc/FDO.txt \
+doc/cache.txt \
+doc/enlightenment.png \
+doc/illume2.png
+
+EXTRA_DIST += \
+$(docfiles_DATA) \
+doc/Doxyfile.in \
+$(wildcard doc/img/*.*) \
+doc/e.css \
+doc/head.html \
+doc/foot.html \
+doc/e.dox.in