From: Tommi Komulainen Date: Mon, 13 Mar 2006 15:45:48 +0000 (+0000) Subject: Update gtk-doc framework bits 2006-03-13 Tommi Komulainen * autogen.sh * configure.ac * doc/Makefile.am: Update gtk-doc framework bits * gtk-doc.make (commit generated file) * doc/hildon-libs-overrides.txt (add empty file for gtk-doc 1.1) --- diff --git a/ChangeLog b/ChangeLog index d414e0e..7198c6d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-03-13 Tommi Komulainen + + * autogen.sh + * configure.ac + * doc/Makefile.am: Update gtk-doc framework bits + * gtk-doc.make (commit generated file) + * doc/hildon-libs-overrides.txt (add empty file for gtk-doc 1.1) + 2006-03-13 Johan Bilien * hildon-widgets/hildon-code-dialog.c: - Add default title diff --git a/Makefile.in b/Makefile.in index 86f783e..03052be 100644 --- a/Makefile.in +++ b/Makefile.in @@ -80,8 +80,9 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@ -GTKDOC = @GTKDOC@ GTK_CFLAGS = @GTK_CFLAGS@ +GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ GTK_LIBS = @GTK_LIBS@ GTK_VERSION = @GTK_VERSION@ HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ @@ -146,7 +147,6 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ -docdir = @docdir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ diff --git a/aclocal.m4 b/aclocal.m4 index 5b727c2..278c760 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -7224,3 +7224,57 @@ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU_GETTEXT($@)]) AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)]) ])dnl +dnl -*- mode: autoconf -*- + +# serial 1 + +dnl Usage: +dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) +AC_DEFUN([GTK_DOC_CHECK], +[ + AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first + AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first + dnl for overriding the documentation installation directory + AC_ARG_WITH(html-dir, + AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, + [with_html_dir='${datadir}/gtk-doc/html']) + HTML_DIR="$with_html_dir" + AC_SUBST(HTML_DIR) + + dnl enable/disable documentation building + AC_ARG_ENABLE(gtk-doc, + AC_HELP_STRING([--enable-gtk-doc], + [use gtk-doc to build documentation [default=no]]),, + enable_gtk_doc=no) + + have_gtk_doc=no + if test -z "$PKG_CONFIG"; then + AC_PATH_PROG(PKG_CONFIG, pkg-config, no) + fi + if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then + have_gtk_doc=yes + fi + + dnl do we want to do a version check? +ifelse([$1],[],, + [gtk_doc_min_version=$1 + if test "$have_gtk_doc" = yes; then + AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version]) + if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + have_gtk_doc=no + fi + fi +]) + if test x$enable_gtk_doc = xyes; then + if test "$have_gtk_doc" != yes; then + enable_gtk_doc=no + fi + fi + + AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) + AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL") +]) + diff --git a/autogen.sh b/autogen.sh index ea1e833..f68431b 100755 --- a/autogen.sh +++ b/autogen.sh @@ -2,6 +2,7 @@ set -x libtoolize --automake +gtkdocize --copy || exit 1 aclocal-1.7 || aclocal autoconf autoheader diff --git a/configure b/configure index 366a3f3..6491180 100755 --- a/configure +++ b/configure @@ -463,7 +463,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG OUTO_CFLAGS OUTO_LIBS GTK_CFLAGS GTK_LIBS GTK_VERSION ESD_CFLAGS ESD_LIBS GNOME_VFS_CFLAGS GNOME_VFS_LIBS GCONF_CFLAGS GCONF_LIBS LIBMB_CFLAGS LIBMB_LIBS ALL_LINGUAS USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS GTKDOC ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE DOXYGEN_FOUND HAVE_DOXYGEN_TRUE HAVE_DOXYGEN_FALSE docdir localedir outomoduledir HTML_DIR LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot build build_cpu build_vendor build_os host host_cpu host_vendor host_os CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PKG_CONFIG OUTO_CFLAGS OUTO_LIBS GTK_CFLAGS GTK_LIBS GTK_VERSION ESD_CFLAGS ESD_LIBS GNOME_VFS_CFLAGS GNOME_VFS_LIBS GCONF_CFLAGS GCONF_LIBS LIBMB_CFLAGS LIBMB_LIBS ALL_LINGUAS USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE DOXYGEN_FOUND HAVE_DOXYGEN_TRUE HAVE_DOXYGEN_FALSE localedir outomoduledir LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -1032,9 +1032,7 @@ Optional Features: --enable-fast-install[=PKGS] optimize for fast installation [default=yes] --disable-libtool-lock avoid locking (might break parallel builds) - --enable-gtk-doc use gtk-doc to build documenta -tion default=yes - --with-doc-dir=PATH path to installed docs + --enable-gtk-doc use gtk-doc to build documentation default=no Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -3955,7 +3953,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 3958 "configure"' > conftest.$ac_ext + echo '#line 3956 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5278,7 +5276,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5281:" \ +echo "$as_me:5279:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6310,11 +6308,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6313: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6311: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6317: \$? = $ac_status" >&5 + echo "$as_me:6315: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6543,11 +6541,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6546: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6544: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6550: \$? = $ac_status" >&5 + echo "$as_me:6548: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -6603,11 +6601,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6606: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6604: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:6610: \$? = $ac_status" >&5 + echo "$as_me:6608: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -8778,7 +8776,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11054: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11060: \$? = $ac_status" >&5 + echo "$as_me:11058: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -11113,11 +11111,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:11116: $lt_compile\"" >&5) + (eval echo "\"\$as_me:11114: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:11120: \$? = $ac_status" >&5 + echo "$as_me:11118: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -12467,7 +12465,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:13393: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13399: \$? = $ac_status" >&5 + echo "$as_me:13397: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -13452,11 +13450,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13455: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13453: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13459: \$? = $ac_status" >&5 + echo "$as_me:13457: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15484,11 +15482,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15487: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15485: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15491: \$? = $ac_status" >&5 + echo "$as_me:15489: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15717,11 +15715,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15720: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15718: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15724: \$? = $ac_status" >&5 + echo "$as_me:15722: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings @@ -15777,11 +15775,11 @@ else -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15780: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15778: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:15784: \$? = $ac_status" >&5 + echo "$as_me:15782: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -17952,7 +17950,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&6 if test "${with_html_dir+set}" = set; then withval="$with_html_dir" +else + with_html_dir='${datadir}/gtk-doc/html' fi; + HTML_DIR="$with_html_dir" + + + # Check whether --enable-gtk-doc or --disable-gtk-doc was given. +if test "${enable_gtk_doc+set}" = set; then + enableval="$enable_gtk_doc" -if test "x$with_html_dir" = "x" ; then - HTML_DIR='${datadir}/gtk-doc/html' else - HTML_DIR=$with_html_dir -fi + enable_gtk_doc=no +fi; -# Extract the first word of "gtkdoc-mkdb", so it can be a program name with args. -set dummy gtkdoc-mkdb; ac_word=$2 + have_gtk_doc=no + if test -z "$PKG_CONFIG"; then + # Extract the first word of "pkg-config", so it can be a program name with args. +set dummy pkg-config; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 -if test "${ac_cv_prog_GTKDOC+set}" = set; then +if test "${ac_cv_path_PKG_CONFIG+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 else - if test -n "$GTKDOC"; then - ac_cv_prog_GTKDOC="$GTKDOC" # Let the user override the test. -else -as_save_IFS=$IFS; IFS=$PATH_SEPARATOR + case $PKG_CONFIG in + [\\/]* | ?:[\\/]*) + ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR for as_dir in $PATH do IFS=$as_save_IFS test -z "$as_dir" && as_dir=. for ac_exec_ext in '' $ac_executable_extensions; do if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then - ac_cv_prog_GTKDOC="true" + ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 break 2 fi done done - test -z "$ac_cv_prog_GTKDOC" && ac_cv_prog_GTKDOC="false" -fi + test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" + ;; +esac fi -GTKDOC=$ac_cv_prog_GTKDOC -if test -n "$GTKDOC"; then - echo "$as_me:$LINENO: result: $GTKDOC" >&5 -echo "${ECHO_T}$GTKDOC" >&6 +PKG_CONFIG=$ac_cv_path_PKG_CONFIG + +if test -n "$PKG_CONFIG"; then + echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 +echo "${ECHO_T}$PKG_CONFIG" >&6 else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 fi + fi + if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then + have_gtk_doc=yes + fi -gtk_doc_min_version=0.10 -if $GTKDOC ; then - gtk_doc_version=`gtkdoc-mkdb --version` - echo "$as_me:$LINENO: checking gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version -" >&5 -echo $ECHO_N "checking gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version -... $ECHO_C" >&6 - if perl <= "$gtk_doc_min_version") ? 0 : 1); -EOF + gtk_doc_min_version=1.0 + if test "$have_gtk_doc" = yes; then + echo "$as_me:$LINENO: checking gtk-doc version >= $gtk_doc_min_version" >&5 +echo $ECHO_N "checking gtk-doc version >= $gtk_doc_min_version... $ECHO_C" >&6 + if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then echo "$as_me:$LINENO: result: yes" >&5 echo "${ECHO_T}yes" >&6 - else + else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 - GTKDOC=false - fi -fi - -# Let people disable the gtk-doc stuff. -# Check whether --enable-gtk-doc or --disable-gtk-doc was given. -if test "${enable_gtk_doc+set}" = set; then - enableval="$enable_gtk_doc" - enable_gtk_doc="$enableval" -else - enable_gtk_doc=yes -fi; + have_gtk_doc=no + fi + fi -if test x$enable_gtk_doc = xauto ; then - if test x$GTKDOC = xtrue ; then - enable_gtk_doc=yes - else - enable_gtk_doc=no + if test x$enable_gtk_doc = xyes; then + if test "$have_gtk_doc" != yes; then + enable_gtk_doc=no + fi fi -fi @@ -21504,6 +21501,17 @@ else fi + +if test -n "$LIBTOOL"; then + GTK_DOC_USE_LIBTOOL_TRUE= + GTK_DOC_USE_LIBTOOL_FALSE='#' +else + GTK_DOC_USE_LIBTOOL_TRUE='#' + GTK_DOC_USE_LIBTOOL_FALSE= +fi + + + # Extract the first word of "doxygen", so it can be a program name with args. set dummy doxygen; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -21554,21 +21562,6 @@ fi localedir=${datadir}/locale outomoduledir=${libdir}/outo -# Check whether --enable-doc-dir or --disable-doc-dir was given. -if test "${enable_doc_dir+set}" = set; then - enableval="$enable_doc_dir" - -fi; -if test "x$with_doc_dir" = "x" ; then - docdir='${datadir}/doc' -else - docdir=$with_doc_dir -fi - -HTML_DIR=${docdir}/html - - - @@ -21692,6 +21685,13 @@ echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi if test -z "${HAVE_DOXYGEN_TRUE}" && test -z "${HAVE_DOXYGEN_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"HAVE_DOXYGEN\" was never defined. Usually this means the macro was only invoked conditionally." >&5 @@ -22332,16 +22332,16 @@ s,@PO_IN_DATADIR_FALSE@,$PO_IN_DATADIR_FALSE,;t t s,@POFILES@,$POFILES,;t t s,@POSUB@,$POSUB,;t t s,@MKINSTALLDIRS@,$MKINSTALLDIRS,;t t -s,@GTKDOC@,$GTKDOC,;t t +s,@HTML_DIR@,$HTML_DIR,;t t s,@ENABLE_GTK_DOC_TRUE@,$ENABLE_GTK_DOC_TRUE,;t t s,@ENABLE_GTK_DOC_FALSE@,$ENABLE_GTK_DOC_FALSE,;t t +s,@GTK_DOC_USE_LIBTOOL_TRUE@,$GTK_DOC_USE_LIBTOOL_TRUE,;t t +s,@GTK_DOC_USE_LIBTOOL_FALSE@,$GTK_DOC_USE_LIBTOOL_FALSE,;t t s,@DOXYGEN_FOUND@,$DOXYGEN_FOUND,;t t s,@HAVE_DOXYGEN_TRUE@,$HAVE_DOXYGEN_TRUE,;t t s,@HAVE_DOXYGEN_FALSE@,$HAVE_DOXYGEN_FALSE,;t t -s,@docdir@,$docdir,;t t s,@localedir@,$localedir,;t t s,@outomoduledir@,$outomoduledir,;t t -s,@HTML_DIR@,$HTML_DIR,;t t s,@LIBOBJS@,$LIBOBJS,;t t s,@LTLIBOBJS@,$LTLIBOBJS,;t t CEOF diff --git a/configure.ac b/configure.ac index 86e93bc..a150660 100644 --- a/configure.ac +++ b/configure.ac @@ -52,46 +52,7 @@ AM_GLIB_GNU_GETTEXT ################################################## # Check for gtk-doc. ################################################## - -AC_ARG_WITH(html-dir, [ --with-html-dir=PATH path to installed docs ]) - -if test "x$with_html_dir" = "x" ; then - HTML_DIR='${datadir}/gtk-doc/html' -else - HTML_DIR=$with_html_dir -fi - -AC_CHECK_PROG(GTKDOC, gtkdoc-mkdb, true, false) - -gtk_doc_min_version=0.10 -if $GTKDOC ; then - gtk_doc_version=`gtkdoc-mkdb --version` - AC_MSG_CHECKING([gtk-doc version ($gtk_doc_version) >= $gtk_doc_min_version] -) - if perl <= "$gtk_doc_min_version") ? 0 : 1); -EOF - AC_MSG_RESULT(yes) - else - AC_MSG_RESULT(no) - GTKDOC=false - fi -fi - -# Let people disable the gtk-doc stuff. -AC_ARG_ENABLE(gtk-doc, [ --enable-gtk-doc use gtk-doc to build documenta -tion [default=yes]], enable_gtk_doc="$enableval", enable_gtk_doc=yes) - -if test x$enable_gtk_doc = xauto ; then - if test x$GTKDOC = xtrue ; then - enable_gtk_doc=yes - else - enable_gtk_doc=no - fi -fi - -AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes) +GTK_DOC_CHECK([1.0]) AC_CHECK_PROG(DOXYGEN_FOUND, doxygen, yes, no) AM_CONDITIONAL(HAVE_DOXYGEN, [test "$DOXYGEN_FOUND" = "yes"]) @@ -99,19 +60,8 @@ AM_CONDITIONAL(HAVE_DOXYGEN, [test "$DOXYGEN_FOUND" = "yes"]) localedir=${datadir}/locale outomoduledir=${libdir}/outo -AC_ARG_ENABLE(doc-dir, [ --with-doc-dir=PATH path to installed docs ]) -if test "x$with_doc_dir" = "x" ; then - docdir='${datadir}/doc' -else - docdir=$with_doc_dir -fi - -HTML_DIR=${docdir}/html - -AC_SUBST(docdir) AC_SUBST(localedir) AC_SUBST(outomoduledir) -AC_SUBST(HTML_DIR) AC_OUTPUT(Makefile \ hildon-widgets/Makefile \ diff --git a/doc/Makefile.am b/doc/Makefile.am index fc845c3..0b18926 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -11,190 +11,41 @@ DOC_MODULE=hildon-libs # The top-level SGML file. Change it if you want. DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml +# Extra options to supply to gtkdoc-scan. +SCAN_OPTIONS= + +# Extra options to pass to gtkdoc-scanobj or gtkdoc-scangobj. +SCANOBJ_OPTIONS=--type-init-func="gtk_type_init(0)" + # The directory containing the source code. Relative to $(srcdir). # gtk-doc will search all .c & .h files beneath here for inline comments # documenting functions and macros. DOC_SOURCE_DIR=../hildon-widgets -# Extra options to pass to gtkdoc-scanobj or gtkdoc-scangobj. -SCANOBJ_OPTIONS=--type-init-func="gtk_type_init(0)" - -# Extra options to supply to gtkdoc-scan. -SCAN_OPTIONS= +# Used for dependencies. +HFILE_GLOB=$(top_srcdir)/hildon-widgets/*.h +CFILE_GLOB=$(top_srcdir)/hildon-widgets/*.c # Header files to ignore when scanning. IGNORE_HFILES=*private* config.h ut md5.h hildon-volumebar-range.h hildon-volumebar-private.h \ hildon-app-private.h -# Files to ignore when making the DB. -IGNORE_FILES=$(IGNORE_HFILES) - -# Extra options to supply to gtkdoc-mkdb. -MKDB_OPTIONS=--ignore-files="$(IGNORE_FILES)" --sgml-mode --output-format=xml - -# Extra options to supply to gtkdoc-fixref. -FIXXREF_OPTIONS= - -# Used for dependencies. -HFILE_GLOB=$(top_srcdir)/hildon-widgets/*.h -CFILE_GLOB=$(top_srcdir)/hildon-widgets/*.c - +# CFLAGS and LDFLAGS for compiling scan program. Only needed if +# $(DOC_MODULE).types is non-empty. +INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir) $(GNOME_VFS_CFLAGS) +GTKDOC_LIBS = $(GTK_LIBS) ../hildon-widgets/libhildonwidgets.la -# Images to copy into HTML directory. -HTML_IMAGES = +# Extra options to supply to gtkdoc-mkdb. +MKDB_OPTIONS=--sgml-mode --output-format=xml # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). content_files = -# Other files to distribute. -extra_files = - -# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib -# contains GtkObjects/GObjects and you want to document signals and properties. -GTKDOC_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir) $(GNOME_VFS_CFLAGS) -GTKDOC_LIBS = $(GTK_LIBS) ../hildon-widgets/libhildonwidgets.la - -GTKDOC_CC=$(LIBTOOL) --mode=compile $(CC) -GTKDOC_LD=$(LIBTOOL) --mode=link $(CC) - -# If you need to override some of the declarations, place them in the -# $(DOC_MODULE)-overrides.txt file and uncomment the second line here. -DOC_OVERRIDES = -#DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt - - - -########################################################################### -# Everything below here is generic and you shouldn't need to change it. -########################################################################### - -TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) - -EXTRA_DIST = \ - $(content_files) \ - $(extra_files) \ - $(HTML_IMAGES) \ - $(DOC_MAIN_SGML_FILE) \ - $(DOC_MODULE).types \ - $(DOC_OVERRIDES) - -DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ - $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp - -SCANOBJ_FILES = \ - $(DOC_MODULE).args \ - $(DOC_MODULE).hierarchy \ - $(DOC_MODULE).interfaces \ - $(DOC_MODULE).prerequisites \ - $(DOC_MODULE).signals - -if ENABLE_GTK_DOC -all-local: html-build.stamp - -#### scan #### - -scan-build.stamp: $(HFILE_GLOB) - @echo '*** Scanning header files ***' - if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ - CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ - else \ - cd $(srcdir) ; \ - for i in $(SCANOBJ_FILES) ; do \ - test -f $$i || touch $$i ; \ - done \ - fi - cd $(srcdir) && \ - gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) - touch scan-build.stamp - -$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp - @true - -#### templates #### - -tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_OVERRIDES) - @echo '*** Rebuilding template files ***' - cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) - touch tmpl-build.stamp - -tmpl.stamp: tmpl-build.stamp - @true - -#### xml #### - -sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml - @echo '*** Building XML ***' - cd $(srcdir) && \ - gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) - touch sgml-build.stamp - -sgml.stamp: sgml-build.stamp - @true - -#### html #### - -html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) - @echo '*** Building HTML ***' - rm -rf $(srcdir)/html - mkdir $(srcdir)/html - cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) - test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) - @echo '-- Fixing Crossreferences' - cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) - touch html-build.stamp -endif - -############## - -clean-local: - rm -rf *~ *.bak $(SCANOBJ_FILES) .libs *-unused.txt $(DOC_STAMPS) - -maintainer-clean-local: clean - cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -gtkdocdir=$(docdir) -gtkdochtmldir=$(gtkdocdir)/html -gtkdocpackagedir=$(gtkdochtmldir)/$(DOC_MODULE) - -gtkdocpackage_DATA = $(wildcard $(srcdir)/html/*.html) - -#install-data-local: -# $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) -# (installfiles=`echo $(srcdir)/html/*.html`; \ -# if test "$$installfiles" = '$(srcdir)/html/*.html'; \ -# then echo '-- Nothing to install' ; \ -# else \ -# for i in $$installfiles; do \ -# echo '-- Installing '$$i ; \ -# $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ -# done; \ -# echo '-- Installing $(srcdir)/html/index.sgml' ; \ -# $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ -# fi) - -# -# Require gtk-doc when making dist -# -if ENABLE_GTK_DOC -dist-check-gtkdoc: -else -dist-check-gtkdoc: - @echo "*** gtk-doc must be installed and enabled in order to make dist" - @false -endif - -dist-hook: dist-check-gtkdoc dist-hook-local - mkdir $(distdir)/tmpl - mkdir $(distdir)/sgml - mkdir $(distdir)/html - -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl - -cp $(srcdir)/xml/*.xml $(distdir)/xml - -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html +# Images to copy into HTML directory. +HTML_IMAGES = - images=$(HTML_IMAGES) ; \ - for i in $$images ; do \ - cp $(srcdir)/$$i $(distdir)/html ; \ - done +# Extra options to supply to gtkdoc-fixref. +FIXXREF_OPTIONS= -.PHONY : dist-hook-local +include $(top_srcdir)/gtk-doc.make diff --git a/doc/Makefile.in b/doc/Makefile.in index 8bacabf..2bb52d0 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -19,6 +19,12 @@ # suit your project. See the GTK+ Makefiles in gtk+/docs/reference for examples # of using the various options. +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ @@ -85,8 +91,9 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@ -GTKDOC = @GTKDOC@ GTK_CFLAGS = @GTK_CFLAGS@ +GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ GTK_LIBS = @GTK_LIBS@ GTK_VERSION = @GTK_VERSION@ HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ @@ -151,7 +158,6 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ -docdir = @docdir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ @@ -181,70 +187,65 @@ DOC_MODULE = hildon-libs # The top-level SGML file. Change it if you want. DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml +# Extra options to supply to gtkdoc-scan. +SCAN_OPTIONS = + +# Extra options to pass to gtkdoc-scanobj or gtkdoc-scangobj. +SCANOBJ_OPTIONS = --type-init-func="gtk_type_init(0)" + # The directory containing the source code. Relative to $(srcdir). # gtk-doc will search all .c & .h files beneath here for inline comments # documenting functions and macros. DOC_SOURCE_DIR = ../hildon-widgets -# Extra options to pass to gtkdoc-scanobj or gtkdoc-scangobj. -SCANOBJ_OPTIONS = --type-init-func="gtk_type_init(0)" - -# Extra options to supply to gtkdoc-scan. -SCAN_OPTIONS = +# Used for dependencies. +HFILE_GLOB = $(top_srcdir)/hildon-widgets/*.h +CFILE_GLOB = $(top_srcdir)/hildon-widgets/*.c # Header files to ignore when scanning. IGNORE_HFILES = *private* config.h ut md5.h hildon-volumebar-range.h hildon-volumebar-private.h \ hildon-app-private.h -# Files to ignore when making the DB. -IGNORE_FILES = $(IGNORE_HFILES) - -# Extra options to supply to gtkdoc-mkdb. -MKDB_OPTIONS = --ignore-files="$(IGNORE_FILES)" --sgml-mode --output-format=xml - -# Extra options to supply to gtkdoc-fixref. -FIXXREF_OPTIONS = +# CFLAGS and LDFLAGS for compiling scan program. Only needed if +# $(DOC_MODULE).types is non-empty. +INCLUDES = $(GTK_CFLAGS) -I$(top_srcdir) $(GNOME_VFS_CFLAGS) -# Used for dependencies. -HFILE_GLOB = $(top_srcdir)/hildon-widgets/*.h -CFILE_GLOB = $(top_srcdir)/hildon-widgets/*.c +GTKDOC_LIBS = $(GTK_LIBS) ../hildon-widgets/libhildonwidgets.la -# Images to copy into HTML directory. -HTML_IMAGES = +# Extra options to supply to gtkdoc-mkdb. +MKDB_OPTIONS = --sgml-mode --output-format=xml # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE). content_files = -# Other files to distribute. -extra_files = - -# CFLAGS and LDFLAGS for compiling scan program. Only needed if your app/lib -# contains GtkObjects/GObjects and you want to document signals and properties. -GTKDOC_CFLAGS = $(GTK_CFLAGS) -I$(top_srcdir) $(GNOME_VFS_CFLAGS) -GTKDOC_LIBS = $(GTK_LIBS) ../hildon-widgets/libhildonwidgets.la +# Images to copy into HTML directory. +HTML_IMAGES = -GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) -GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) +# Extra options to supply to gtkdoc-fixref. +FIXXREF_OPTIONS = +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) -# If you need to override some of the declarations, place them in the -# $(DOC_MODULE)-overrides.txt file and uncomment the second line here. -DOC_OVERRIDES = +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -#DOC_OVERRIDES = $(DOC_MODULE)-overrides.txt +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) -########################################################################### -# Everything below here is generic and you shouldn't need to change it. -########################################################################### TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE) EXTRA_DIST = \ $(content_files) \ - $(extra_files) \ $(HTML_IMAGES) \ $(DOC_MAIN_SGML_FILE) \ $(DOC_MODULE).types \ - $(DOC_OVERRIDES) + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ @@ -259,24 +260,19 @@ SCANOBJ_FILES = \ $(DOC_MODULE).signals -gtkdocdir = $(docdir) -gtkdochtmldir = $(gtkdocdir)/html -gtkdocpackagedir = $(gtkdochtmldir)/$(DOC_MODULE) - -gtkdocpackage_DATA = $(wildcard $(srcdir)/html/*.html) +CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-scan.o $(DOC_MODULE)-unused.txt $(DOC_STAMPS) subdir = doc ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = DIST_SOURCES = -DATA = $(gtkdocpackage_DATA) - -DIST_COMMON = $(srcdir)/Makefile.in Makefile.am +DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/gtk-doc.make \ + Makefile.am all: all-am .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/gtk-doc.make $(top_srcdir)/configure.ac $(ACLOCAL_M4) cd $(top_srcdir) && \ $(AUTOMAKE) --foreign doc/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -291,24 +287,6 @@ clean-libtool: distclean-libtool: -rm -f libtool uninstall-info-am: -gtkdocpackageDATA_INSTALL = $(INSTALL_DATA) -install-gtkdocpackageDATA: $(gtkdocpackage_DATA) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(gtkdocpackagedir) - @list='$(gtkdocpackage_DATA)'; for p in $$list; do \ - if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(gtkdocpackageDATA_INSTALL) $$d$$p $(DESTDIR)$(gtkdocpackagedir)/$$f"; \ - $(gtkdocpackageDATA_INSTALL) $$d$$p $(DESTDIR)$(gtkdocpackagedir)/$$f; \ - done - -uninstall-gtkdocpackageDATA: - @$(NORMAL_UNINSTALL) - @list='$(gtkdocpackage_DATA)'; for p in $$list; do \ - f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " rm -f $(DESTDIR)$(gtkdocpackagedir)/$$f"; \ - rm -f $(DESTDIR)$(gtkdocpackagedir)/$$f; \ - done tags: TAGS TAGS: @@ -321,6 +299,7 @@ top_distdir = .. distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) + $(mkinstalldirs) $(distdir)/.. @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ list='$(DISTFILES)'; for file in $$list; do \ @@ -352,10 +331,9 @@ distdir: $(DISTFILES) dist-hook check-am: all-am check: check-am -all-am: Makefile $(DATA) all-local +all-am: Makefile all-local installdirs: - $(mkinstalldirs) $(DESTDIR)$(gtkdocpackagedir) install: install-am install-exec: install-exec-am install-data: install-data-am @@ -373,6 +351,7 @@ install-strip: mostlyclean-generic: clean-generic: + -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES) distclean-generic: -rm -f $(CONFIG_CLEAN_FILES) @@ -396,7 +375,7 @@ info: info-am info-am: -install-data-am: install-gtkdocpackageDATA +install-data-am: install-data-local install-exec-am: @@ -423,19 +402,18 @@ ps: ps-am ps-am: -uninstall-am: uninstall-gtkdocpackageDATA uninstall-info-am +uninstall-am: uninstall-info-am uninstall-local .PHONY: all all-am all-local check check-am clean clean-generic \ clean-libtool clean-local distclean distclean-generic \ distclean-libtool distdir dvi dvi-am info info-am install \ - install-am install-data install-data-am install-exec \ - install-exec-am install-gtkdocpackageDATA install-info \ - install-info-am install-man install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic maintainer-clean-local mostlyclean \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - uninstall uninstall-am uninstall-gtkdocpackageDATA \ - uninstall-info-am + install-am install-data install-data-am install-data-local \ + install-exec install-exec-am install-info install-info-am \ + install-man install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + maintainer-clean-local mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \ + uninstall-info-am uninstall-local @ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp @@ -444,8 +422,9 @@ uninstall-am: uninstall-gtkdocpackageDATA uninstall-info-am @ENABLE_GTK_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) @ENABLE_GTK_DOC_TRUE@ @echo '*** Scanning header files ***' +@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ -@ENABLE_GTK_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ +@ENABLE_GTK_DOC_TRUE@ CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ @ENABLE_GTK_DOC_TRUE@ else \ @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) ; \ @ENABLE_GTK_DOC_TRUE@ for i in $(SCANOBJ_FILES) ; do \ @@ -461,8 +440,9 @@ uninstall-am: uninstall-gtkdocpackageDATA uninstall-info-am #### templates #### -@ENABLE_GTK_DOC_TRUE@tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_OVERRIDES) +@ENABLE_GTK_DOC_TRUE@tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt @ENABLE_GTK_DOC_TRUE@ @echo '*** Rebuilding template files ***' +@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) @ENABLE_GTK_DOC_TRUE@ touch tmpl-build.stamp @@ -473,8 +453,9 @@ uninstall-am: uninstall-gtkdocpackageDATA uninstall-info-am @ENABLE_GTK_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml @ENABLE_GTK_DOC_TRUE@ @echo '*** Building XML ***' +@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) @ENABLE_GTK_DOC_TRUE@ cd $(srcdir) && \ -@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --main-sgml-file=$(DOC_MAIN_SGML_FILE) $(MKDB_OPTIONS) +@ENABLE_GTK_DOC_TRUE@ gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS) @ENABLE_GTK_DOC_TRUE@ touch sgml-build.stamp @ENABLE_GTK_DOC_TRUE@sgml.stamp: sgml-build.stamp @@ -484,7 +465,8 @@ uninstall-am: uninstall-gtkdocpackageDATA uninstall-info-am @ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) @ENABLE_GTK_DOC_TRUE@ @echo '*** Building HTML ***' -@ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html +@ENABLE_GTK_DOC_TRUE@ @-chmod -R u+w $(srcdir) +@ENABLE_GTK_DOC_TRUE@ rm -rf $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ mkdir $(srcdir)/html @ENABLE_GTK_DOC_TRUE@ cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) @ENABLE_GTK_DOC_TRUE@ test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) @@ -495,24 +477,27 @@ uninstall-am: uninstall-gtkdocpackageDATA uninstall-info-am ############## clean-local: - rm -rf *~ *.bak $(SCANOBJ_FILES) .libs *-unused.txt $(DOC_STAMPS) + rm -f *~ *.bak maintainer-clean-local: clean - cd $(srcdir) && rm -rf sgml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt - -#install-data-local: -# $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) -# (installfiles=`echo $(srcdir)/html/*.html`; \ -# if test "$$installfiles" = '$(srcdir)/html/*.html'; \ -# then echo '-- Nothing to install' ; \ -# else \ -# for i in $$installfiles; do \ -# echo '-- Installing '$$i ; \ -# $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ -# done; \ -# echo '-- Installing $(srcdir)/html/index.sgml' ; \ -# $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \ -# fi) + cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + +install-data-local: + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) + (installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + fi) + +uninstall-local: + rm -f $(DESTDIR)$(TARGET_DIR)/* # # Require gtk-doc when making dist @@ -524,16 +509,11 @@ maintainer-clean-local: clean dist-hook: dist-check-gtkdoc dist-hook-local mkdir $(distdir)/tmpl - mkdir $(distdir)/sgml + mkdir $(distdir)/xml mkdir $(distdir)/html -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl -cp $(srcdir)/xml/*.xml $(distdir)/xml - -cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html - - images=$(HTML_IMAGES) ; \ - for i in $$images ; do \ - cp $(srcdir)/$$i $(distdir)/html ; \ - done + -cp $(srcdir)/html/* $(distdir)/html .PHONY : dist-hook-local # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/doc/hildon-libs-overrides.txt b/doc/hildon-libs-overrides.txt new file mode 100644 index 0000000..e69de29 diff --git a/gtk-doc.make b/gtk-doc.make new file mode 100644 index 0000000..c319e7a --- /dev/null +++ b/gtk-doc.make @@ -0,0 +1,148 @@ +# -*- mode: makefile -*- + +#################################### +# Everything below here is generic # +#################################### + +if GTK_DOC_USE_LIBTOOL +GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +else +GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS) +GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) +endif + +# We set GPATH here; this gives us semantics for GNU make +# which are more like other make's VPATH, when it comes to +# whether a source that is a target of one rule is then +# searched for in VPATH/GPATH. +# +GPATH = $(srcdir) + +TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE) + +EXTRA_DIST = \ + $(content_files) \ + $(HTML_IMAGES) \ + $(DOC_MAIN_SGML_FILE) \ + $(DOC_MODULE).types \ + $(DOC_MODULE)-sections.txt \ + $(DOC_MODULE)-overrides.txt + +DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \ + $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp + +SCANOBJ_FILES = \ + $(DOC_MODULE).args \ + $(DOC_MODULE).hierarchy \ + $(DOC_MODULE).interfaces \ + $(DOC_MODULE).prerequisites \ + $(DOC_MODULE).signals + +CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-scan.o $(DOC_MODULE)-unused.txt $(DOC_STAMPS) + +if ENABLE_GTK_DOC +all-local: html-build.stamp + +#### scan #### + +scan-build.stamp: $(HFILE_GLOB) + @echo '*** Scanning header files ***' + @-chmod -R u+w $(srcdir) + if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null ; then \ + CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \ + else \ + cd $(srcdir) ; \ + for i in $(SCANOBJ_FILES) ; do \ + test -f $$i || touch $$i ; \ + done \ + fi + cd $(srcdir) && \ + gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES) + touch scan-build.stamp + +$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp + @true + +#### templates #### + +tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt + @echo '*** Rebuilding template files ***' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) + touch tmpl-build.stamp + +tmpl.stamp: tmpl-build.stamp + @true + +#### xml #### + +sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml + @echo '*** Building XML ***' + @-chmod -R u+w $(srcdir) + cd $(srcdir) && \ + gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml $(MKDB_OPTIONS) + touch sgml-build.stamp + +sgml.stamp: sgml-build.stamp + @true + +#### html #### + +html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files) + @echo '*** Building HTML ***' + @-chmod -R u+w $(srcdir) + rm -rf $(srcdir)/html + mkdir $(srcdir)/html + cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE) + test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html ) + @echo '-- Fixing Crossreferences' + cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS) + touch html-build.stamp +endif + +############## + +clean-local: + rm -f *~ *.bak + +maintainer-clean-local: clean + cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt + +install-data-local: + $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR) + (installfiles=`echo $(srcdir)/html/*`; \ + if test "$$installfiles" = '$(srcdir)/html/*'; \ + then echo '-- Nothing to install' ; \ + else \ + for i in $$installfiles; do \ + echo '-- Installing '$$i ; \ + $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ + fi) + +uninstall-local: + rm -f $(DESTDIR)$(TARGET_DIR)/* + +# +# Require gtk-doc when making dist +# +if ENABLE_GTK_DOC +dist-check-gtkdoc: +else +dist-check-gtkdoc: + @echo "*** gtk-doc must be installed and enabled in order to make dist" + @false +endif + +dist-hook: dist-check-gtkdoc dist-hook-local + mkdir $(distdir)/tmpl + mkdir $(distdir)/xml + mkdir $(distdir)/html + -cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl + -cp $(srcdir)/xml/*.xml $(distdir)/xml + -cp $(srcdir)/html/* $(distdir)/html + +.PHONY : dist-hook-local diff --git a/hildon-widgets/Makefile.in b/hildon-widgets/Makefile.in index 6555254..9ffb275 100644 --- a/hildon-widgets/Makefile.in +++ b/hildon-widgets/Makefile.in @@ -80,8 +80,9 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@ -GTKDOC = @GTKDOC@ GTK_CFLAGS = @GTK_CFLAGS@ +GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ GTK_LIBS = @GTK_LIBS@ GTK_VERSION = @GTK_VERSION@ HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ @@ -146,7 +147,6 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ -docdir = @docdir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ diff --git a/po/Makefile.in b/po/Makefile.in index 08ca523..b46af85 100644 --- a/po/Makefile.in +++ b/po/Makefile.in @@ -80,8 +80,9 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@ -GTKDOC = @GTKDOC@ GTK_CFLAGS = @GTK_CFLAGS@ +GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ GTK_LIBS = @GTK_LIBS@ GTK_VERSION = @GTK_VERSION@ HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ @@ -146,7 +147,6 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ -docdir = @docdir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ diff --git a/timer/Makefile.in b/timer/Makefile.in index 7d228be..5140b42 100644 --- a/timer/Makefile.in +++ b/timer/Makefile.in @@ -83,8 +83,9 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@ -GTKDOC = @GTKDOC@ GTK_CFLAGS = @GTK_CFLAGS@ +GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ GTK_LIBS = @GTK_LIBS@ GTK_VERSION = @GTK_VERSION@ HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ @@ -149,7 +150,6 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ -docdir = @docdir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@ diff --git a/ut/Makefile.in b/ut/Makefile.in index 76b01e4..4a6a124 100644 --- a/ut/Makefile.in +++ b/ut/Makefile.in @@ -80,8 +80,9 @@ GMOFILES = @GMOFILES@ GMSGFMT = @GMSGFMT@ GNOME_VFS_CFLAGS = @GNOME_VFS_CFLAGS@ GNOME_VFS_LIBS = @GNOME_VFS_LIBS@ -GTKDOC = @GTKDOC@ GTK_CFLAGS = @GTK_CFLAGS@ +GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@ +GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@ GTK_LIBS = @GTK_LIBS@ GTK_VERSION = @GTK_VERSION@ HAVE_DOXYGEN_FALSE = @HAVE_DOXYGEN_FALSE@ @@ -146,7 +147,6 @@ build_cpu = @build_cpu@ build_os = @build_os@ build_vendor = @build_vendor@ datadir = @datadir@ -docdir = @docdir@ exec_prefix = @exec_prefix@ host = @host@ host_alias = @host_alias@