Changeset f1fc216

Timestamp:

Dec 11, 2016, 12:48:36 AM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, sampler, yinfft+

Children:

dd93e80

Parents:

5f9729d

Message:

Makefile: add rules for documentation, simplify listing

File:

• Makefile (modified) (2 diffs)

Makefile

@@ -70 +70 @@
 
 list_installed:
-        find $(DESTDIR) -ls | \
-                sed 's|$(DESTDIR)|/«destdir»|'
+        find $(DESTDIR) -ls | sed 's|$(DESTDIR)|/«destdir»|'
 
 list_installed_python:
-        ( find $(PYDESTDIR) -ls || make list_installed_python_package ) | \
-                sed 's|$(PYDESTDIR)|/«pydestdir»|'
-
-list_installed_python_package:
         pip show -f aubio
-        PACKAGE_LOCATION=$(shell pip show -f aubio | grep ^Location | cut -d \  -f 2) \
-                make list_installed_python_package_content
-
-list_installed_python_package_content:
-        ( [ -d $(PACKAGE_LOCATION) ] && find $(PACKAGE_LOCATION) -ls ) || \
-                unzip -l $(PACKAGE_LOCATION)
 
 list_all_installed: list_installed list_installed_python
@@ -241 +230 @@
         check_clean_python
 
-
-html:
-        cd doc && make html
+sphinx: configure
+        $(WAFCMD) sphinx $(WAFOPTS)
+
+doxygen: configure
+        $(WAFCMD) doxygen $(WAFOPTS)
+
+manpages: configure
+        $(WAFCMD) manpages $(WAFOPTS)
+
+html: doxygen sphinx
+
+docs: html manpages
 
 dist: distclean expandwaf