diff --git a/Makefile.am b/Makefile.am index 46415ef5a5d5cb08bd023fdefd179d476931cd39..d36c31c3604876f1978b43b46f1435a801054d51 100644 --- a/Makefile.am +++ b/Makefile.am @@ -59,7 +59,7 @@ CLEANFILES = $(dist_man_MANS) built-sources clean-built-sources valcheck doxygen: @failcom='exit 1'; for f in x $$MAKEFLAGS; do \ case $$f in *=* | --[!k]*);; *k*) failcom='fail=yes';; esac; done; \ - for i in libsofia-sip-ua $(GLIB_SUBDIRS) ; do \ + for i in utils libsofia-sip-ua $(GLIB_SUBDIRS) ; do \ (cd $$i && $(MAKE) $(AM_MAKEFLAGS) $@) || eval $$failcom; \ done ; \ test -z "$$fail" diff --git a/libsofia-sip-ua/Makefile.am b/libsofia-sip-ua/Makefile.am index e2ba278563be78fb4eb7fa2ed696705820243e3a..eaa86c753ef434c278b96d756b82cd92d576be5c 100644 --- a/libsofia-sip-ua/Makefile.am +++ b/libsofia-sip-ua/Makefile.am @@ -68,7 +68,7 @@ checklib: checklib-recursive $(lib_LTLIBRARIES) doxygen: built-sources @echo Generating empty doxytags - mkdir -p docs/html ; \ + @mkdir -p docs/html ; \ for d in $(DIST_SUBDIRS); do \ test -r $$d/Doxyfile || continue ; \ if ! test -r docs/$$d.doxytags ; then \ @@ -79,7 +79,7 @@ doxygen: built-sources mv -f docs/$$d.doxytags.tmp docs/$$d.doxytags ; \ fi ; \ done - for d in $(DIST_SUBDIRS); do \ + @for d in $(DIST_SUBDIRS); do \ ( test -r $$d/Doxyfile && \ cd $$d > /dev/null && \ echo running ${DOXYGEN} first time in $$d && \ @@ -90,9 +90,9 @@ doxygen: built-sources docs/$$d.doxytags > docs/$$d.doxytags.tmp && \ mv -f docs/$$d.doxytags.tmp docs/$$d.doxytags ; \ done - for d in $(DIST_SUBDIRS); do \ + @for d in $(DIST_SUBDIRS); do \ ( test -r $$d/Doxyfile && \ - cd $$d > /dev/null \ + cd $$d > /dev/null && \ echo running ${DOXYGEN} second time in $$d && \ ${DOXYGEN} 2>&1 ) | \ egrep -v -i -e 'Warning: Unsupported (xml/)?html tag' ; \ diff --git a/utils/Makefile.am b/utils/Makefile.am index 6187434cf7de9189a35c74d170dd788f5187105b..432caa2b83cd13eb0c9ac733d1c1a56870009e00 100644 --- a/utils/Makefile.am +++ b/utils/Makefile.am @@ -18,9 +18,8 @@ LDADD = ../libsofia-sip-ua/libsofia-sip-ua.la $(GLIB_LIBS) # ---------------------------------------------------------------------- # Dist and install -EXTRA_DIST = utils.docs -CLEANFILES = utils.doxytags +EXTRA_DIST = utils.docs # ---------------------------------------------------------------------- # Sofia specific rules @@ -28,3 +27,10 @@ CLEANFILES = utils.doxytags include $(top_srcdir)/rules/sofia.am INCLUDES = ${INTERNAL_INCLUDES} + +built-sources clean-built-sources valcheck: + +doxygen: + doxygen + +PHONY = built-sources clean-built-sources valcheck doxygen