Commits

shuerhaaken committed 9c41e59

fix doc creation and installation

Comments (0)

Files changed (6)

 Jörn Magens <shuerhaaken@googlemail.com>
 Matias De lellis <mati86dl@gmail.com>
 Pavel Vasin <rat4vier@gmail.com>
-J.Rios
-
+shuerhaaken <shuerhaaken@googlemail.com>
+Tal Hadad <tal_hd@hotmail.com>
+commit 26261ac7145f75a86a2ff59bf71defd534806e06
+Author: Jörn Magens <shuerhaaken@googlemail.com>
+Date:   Wed Oct 23 13:02:30 2013 +0200
+
+    fix image peek for flac
+
 commit 5488b92242fb86bb8fa5177341147fea638f0329
 Author: Jörn Magens <shuerhaaken@googlemail.com>
 Date:   Wed Oct 23 12:41:28 2013 +0200
 
 .PHONY: ChangeLog
 
-docs:
-	-cd doc && $(MAKE) $(AM_MAKEFLAGS) $@
-
 ChangeLog: Makefile
 	(GIT_DIR=$(top_srcdir)/.git git log > .changelog.tmp \
 	&& mv -f .changelog.tmp ChangeLog; rm -f .changelog.tmp) \
 	|| (touch ChangeLog; echo 'Git directory not found: installing possibly empty changelog.' >&2)
 
-dist-hook: ChangeLog docs
+dist-hook: ChangeLog
 

bindings/vala/libtaginfo_c.vapi

 		//! Picture from a movie or video related to the track
 		MOVIESCREENCAPTURE,
 		//! Picture of a large, coloured fish.
-		COLOURED_FISH
+		COLOURED_FISH,
 		//! Illustration related to the track
 		ILLUSTRATION,
 		//! Logo of the band or performer
 
 AC_SUBST([LIBTAGINFO_SO_VERSION], [1:0:0])
 
-AC_CHECK_PROGS([DOXYGEN], [doxygen])
-if test -z "$DOXYGEN";
-    then AC_MSG_WARN([Doxygen not found - continuing without Doxygen support])
-fi
+### Doxygen Documentation
+
+AC_ARG_ENABLE(doxygen-docs, AS_HELP_STRING([--enable-doxygen-docs],[build DOXYGEN documentation (requires Doxygen)]),enable_doxygen_docs=$enableval,enable_doxygen_docs=auto)
+
+AC_PATH_PROG(DOXYGEN, doxygen, no)
+
+AC_MSG_CHECKING([whether to build Doxygen documentation])
 
-if test -z "$DOXYGEN";
-    then BUILD_DOC="no"
+if test x$DOXYGEN = xno ; then
+    have_doxygen=no
 else
-    BUILD_DOC="yes"
+    have_doxygen=yes
+fi
+
+if test x$enable_doxygen_docs = xauto ; then
+    if test x$have_doxygen = xno ; then
+        enable_doxygen_docs=no
+    else
+        enable_doxygen_docs=yes
+    fi
+fi
+
+if test x$enable_doxygen_docs = xyes; then
+    if test x$have_doxygen = xno; then
+    AC_MSG_ERROR([Building Doxygen docs explicitly required, but Doxygen not found])
+    else
+    AC_CONFIG_FILES([docs/Doxyfile_lib docs/Doxyfile_c])
+    fi
 fi
 
-AM_CONDITIONAL([HAVE_DOXYGEN],
-[test -n "$DOXYGEN"])AM_COND_IF([HAVE_DOXYGEN], [AC_CONFIG_FILES([docs/Doxyfile_lib docs/Doxyfile_c])])
+AM_CONDITIONAL(LIBTAGINFO_DOXYGEN_DOCS_ENABLED, test x$enable_doxygen_docs = xyes)
+AC_MSG_RESULT($enable_doxygen_docs)
 
 AM_SILENT_RULES([yes])
 
     Prefix:                        ${prefix}
     CFLAGS:                        ${CFLAGS}
     CXXFLAGS:                      ${CXXFLAGS}
-    Build Documentation:           ${BUILD_DOC}
+    Build Doxygen docs:            ${enable_doxygen_docs}
   
   
 "
-if HAVE_DOXYGEN
+apidir  = @htmldir@/api
+capidir = @htmldir@/c_api
+
+EXTRA_DIST = \
+    field_name_table.ods \
+    Doxyfile_lib \
+    Doxyfile_lib.in \
+    Doxyfile_c \
+    Doxyfile_c.in
 
-doxyfile_lib.stamp:
-	$(DOXYGEN) Doxyfile_lib
-	echo Timestamp > doxyfile_lib.stamp
 
-doxyfile_c.stamp:
-	$(DOXYGEN) Doxyfile_c
-	echo Timestamp > doxyfile_c.stamp
+if LIBTAGINFO_DOXYGEN_DOCS_ENABLED
+
+doxyfile_lib.stamp: $(wildcard $(top_srcdir)/libtaginfo/*)
+	$(AM_V_GEN)cd $(top_builddir)/docs && doxygen Doxyfile_lib
+	@touch $@
+
+doxyfile_c.stamp: $(wildcard $(top_srcdir)/bindings/c/*)
+	$(AM_V_GEN)cd $(top_builddir)/docs && doxygen Doxyfile_c
+	@touch $@
 
 CLEANFILES = doxyfile_lib.stamp doxyfile_c.stamp
 
 all-local: doxyfile_lib.stamp doxyfile_c.stamp
-clean-local:
-	rm -f $(top_builddir)/docs/libtaginfo/html/*
-	rm -f $(top_builddir)/docs/libtaginfo_c/html/*
+
+# Assume CREATE_SUBDIRS is set to NO in the according Doxyfile
+install-data-local:: doxyfile_lib.stamp doxyfile_c.stamp
+	$(MKDIR_P) $(DESTDIR)$(apidir)
+	$(INSTALL_DATA) libtaginfo/html/* $(DESTDIR)$(apidir)
+	$(MKDIR_P) $(DESTDIR)$(capidir)
+	$(INSTALL_DATA) libtaginfo_c/html/* $(DESTDIR)$(capidir)
+
+uninstall-local::
+	rm -f $(DESTDIR)$(apidir)/*.html
+	rm -f $(DESTDIR)$(apidir)/*.png
+	rm -f $(DESTDIR)$(apidir)/*.css
+	rm -f $(DESTDIR)$(apidir)/*.js
+	rm -f $(DESTDIR)$(capidir)/*.html
+	rm -f $(DESTDIR)$(capidir)/*.png
+	rm -f $(DESTDIR)$(capidir)/*.css
+	rm -f $(DESTDIR)$(capidir)/*.js
+	rm -f $(DESTDIR)$(htmldir)/*.html
+	rm -f $(DESTDIR)$(docdir)/*.txt
+	rm -f $(DESTDIR)$(htmldir)/*.png
+	rm -f $(DESTDIR)$(htmldir)/*.svg
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)$(apidir) || \
+		rmdir $(DESTDIR)$(apidir)
+	rmdir --ignore-fail-on-non-empty $(DESTDIR)$(capidir) || \
+		rmdir $(DESTDIR)$(capidir)
+
+endif
 
 DISTCLEANFILES = \
     doxyfile_lib.stamp \
     doxyfile_c.stamp \
     Makefile.in
 
-EXTRA_DIST = \
-    field_name_table.ods \
-    Doxyfile_lib \
-    Doxyfile_lib.in \
-    Doxyfile_c \
-    Doxyfile_c.in \
-    $(top_builddir)/docs/libtaginfo/html
-
-endif
+clean-local:
+	rm -rf libtaginfo
+	rm -rf libtaginfo_c
+	rm -f doxyfile_lib.stamp
+	rm -f doxyfile_c.stamp
 
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.