[gtkmm] Convert documentation to new build system
- From: Daniel Elstner <daniel src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gtkmm] Convert documentation to new build system
- Date: Wed, 12 Aug 2009 18:35:54 +0000 (UTC)
commit 338144bd218a6d9c4315083558d050235fdbf6e4
Author: Daniel Elstner <danielk openismus com>
Date: Wed Aug 12 20:24:58 2009 +0200
Convert documentation to new build system
* configure.ac (MM_ARG_ENABLE_DOCUMENTATION): Call macro.
(MM_ARG_WITH_TAGFILE_DOC): Call once for each tagfile dependency.
(AC_CONFIG_FILES): Remove output files docs/images/Makefile and
docs/reference/**/Makefile from the list.
* Makefile.am (SUBDIRS): Include docs/ conditionally.
* docs/Makefile.am: Rewrite based upon the new doc-reference.am
build support file from the mm-common module.
* docs/reference/Doxyfile.in: Replace with modernized Doxygen
configuration and adapt to the new mm-common build organization.
* docs/images/Makefile.am: Delete old recursive build file.
* docs/reference/Makefile.am: ditto,
* docs/reference/reference/Makefile.am: ditto,
* docs/reference/images/Makefile.am: ditto,
* docs/reference/images/widgets/Makefile.am: ditto.
* atk/atkmm-1.6.pc.in, gdk/gdkmm-2.4.pc.in, gtk/gtkmm-2.4.pc.in:
Overhaul and make use of more configuration substitutions. Provide
the locations of the reference documentation and the tag file.
.gitignore | 12 +-
ChangeLog | 22 +++
Makefile.am | 9 +-
atk/atkmm-1.6.pc.in | 18 ++-
configure.ac | 15 +-
docs/Makefile.am | 82 ++++++----
docs/images/Makefile.am | 16 --
docs/reference/Doxyfile.in | 261 ++++++++++++++++++-----------
docs/reference/Makefile.am | 116 -------------
docs/reference/images/Makefile.am | 5 -
docs/reference/images/widgets/Makefile.am | 10 -
gdk/gdkmm-2.4.pc.in | 18 ++-
gtk/gtkmm-2.4.pc.in | 18 ++-
13 files changed, 294 insertions(+), 308 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c514172..06e7b9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,13 +83,11 @@ demos/gtk-demo/gtkmm-demo
demos/pixbuf-demo
# docs
-docs/reference/Doxyfile
-docs/reference/doxygen-output.txt
-docs/reference/doxygen-warnings.txt
-docs/reference/gtkmm-2.4.devhelp
-docs/reference/gtkmm_doxygen_tags
-docs/reference/html/
-docs/reference/xml/
+/docs/reference/Doxyfile
+/docs/reference/doxygen.log
+/docs/reference/gtkmm-*.devhelp2
+/docs/reference/gtkmm-*.tag
+/docs/reference/html/
# gdk
gdk/gdkmm-2.4.pc
diff --git a/ChangeLog b/ChangeLog
index 41b304f..a87c68d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,27 @@
2009-08-12 Daniel Elstner <danielk openismus com>
+ Convert documentation to new build system
+
+ * configure.ac (MM_ARG_ENABLE_DOCUMENTATION): Call macro.
+ (MM_ARG_WITH_TAGFILE_DOC): Call once for each tagfile dependency.
+ (AC_CONFIG_FILES): Remove output files docs/images/Makefile and
+ docs/reference/**/Makefile from the list.
+ * Makefile.am (SUBDIRS): Include docs/ conditionally.
+ * docs/Makefile.am: Rewrite based upon the new doc-reference.am
+ build support file from the mm-common module.
+ * docs/reference/Doxyfile.in: Replace with modernized Doxygen
+ configuration and adapt to the new mm-common build organization.
+ * docs/images/Makefile.am: Delete old recursive build file.
+ * docs/reference/Makefile.am: ditto,
+ * docs/reference/reference/Makefile.am: ditto,
+ * docs/reference/images/Makefile.am: ditto,
+ * docs/reference/images/widgets/Makefile.am: ditto.
+ * atk/atkmm-1.6.pc.in, gdk/gdkmm-2.4.pc.in, gtk/gtkmm-2.4.pc.in:
+ Overhaul and make use of more configuration substitutions. Provide
+ the locations of the reference documentation and the tag file.
+
+2009-08-12 Daniel Elstner <danielk openismus com>
+
Convert main source directories to mm-common
* configure.ac: Get rid of some more cruft we no longer need.
diff --git a/Makefile.am b/Makefile.am
index a30efff..96f728c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,8 +32,13 @@ src_subdirs = tools $(atk_maint_subdir) gdk/src gtk/src
else
src_subdirs =
endif
-SUBDIRS = $(src_subdirs) $(atk_built_subdir) gdk/gdkmm gtk/gtkmm tests
-DIST_SUBDIRS = $(SUBDIRS) demos docs scripts
+if ENABLE_DOCUMENTATION
+doc_subdirs = docs
+else
+doc_subdirs =
+endif
+SUBDIRS = $(src_subdirs) $(atk_built_subdir) gdk/gdkmm gtk/gtkmm tests $(doc_subdirs)
+DIST_SUBDIRS = tools atk/src gdk/src gtk/src atk/atkmm gdk/gdkmm gtk/gtkmm tests demos docs scripts
if GTKMM_ATKMM_ENABLED
atkmm_includedir = $(includedir)/$(ATKMM_MODULE_NAME)
diff --git a/atk/atkmm-1.6.pc.in b/atk/atkmm-1.6.pc.in
index b17fad5..17e1e18 100644
--- a/atk/atkmm-1.6.pc.in
+++ b/atk/atkmm-1.6.pc.in
@@ -1,11 +1,19 @@
prefix= prefix@
exec_prefix= exec_prefix@
libdir= libdir@
+datarootdir= datarootdir@
+datadir= datadir@
includedir= includedir@
+docdir=${datarootdir}/doc/@GTKMM_MODULE_NAME@
+doxytagfile=${docdir}/reference/@GTKMM_MODULE_NAME tag
+htmlrefdir=${docdir}/reference/html
+htmlrefpub=http://www.gtkmm.org/docs/@GTKMM_MODULE_NAME@/docs/reference/html
+
Name: atkmm
-Description: C++ wrapper for atk
-Requires: glibmm-2.4 atk
-Version: @VERSION@
-Libs: -L${libdir} -latkmm-1.6
-Cflags: -I${includedir}/atkmm-1.6
+Description: C++ binding for the ATK accessibility toolkit
+Version: @PACKAGE_VERSION@
+URL: http://www.gtkmm.org/
+Requires: @ATKMM_MODULES@
+Libs: -L${libdir} -latkmm- ATKMM_API_VERSION@
+Cflags: -I${includedir}/@ATKMM_MODULE_NAME@
diff --git a/configure.ac b/configure.ac
index 28a0fd7..687baec 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,9 +68,12 @@ MM_PKG_CONFIG_SUBST([GTHREAD_CFLAGS], [--cflags-only-other gthread-2.0])
MM_PKG_CONFIG_SUBST([GTHREAD_LIBS], [--libs gthread-2.0])
MM_PKG_CONFIG_SUBST([GMMPROC_DIR], [--variable=gmmprocdir glibmm-2.4])
-# Create a list of input directories for Doxygen.
-# TODO: kill
-GTKMM_DOXYGEN_INPUT_SUBDIRS([atk gdk gtk])
+MM_ARG_ENABLE_DOCUMENTATION
+MM_ARG_WITH_TAGFILE_DOC([libstdc++.tag], [mm-common-libstdc++])
+MM_ARG_WITH_TAGFILE_DOC([libsigc++-2.0.tag], [sigc++-2.0])
+MM_ARG_WITH_TAGFILE_DOC([glibmm-2.4.tag], [glibmm-2.4])
+MM_ARG_WITH_TAGFILE_DOC([pangomm-2.4.tag], [pangomm-2.4])
+MM_ARG_WITH_TAGFILE_DOC([cairomm_doxygen_tags], [cairomm-1.0])
# TODO: Refactor into shared Autoconf macro
AC_ARG_ENABLE([deprecated-api],
@@ -119,11 +122,7 @@ AC_CONFIG_FILES([
AC_CONFIG_FILES([
docs/Makefile
- docs/images/Makefile
- docs/reference/Makefile
- docs/reference/Doxyfile
- docs/reference/images/Makefile
- docs/reference/images/widgets/Makefile
+ docs/reference/Doxyfile
])
AC_CONFIG_FILES([
diff --git a/docs/Makefile.am b/docs/Makefile.am
index dc6daca..3013ba4 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,34 +1,48 @@
-## Copyright (c) 2001
-## The gtkmm development team.
-
-SUBDIRS = images reference
-
-EXTRA_DIST = Makefile_web.am_fragment
-
-#gtkmm_doc_DATA =
-
-include $(top_srcdir)/docs/Makefile_web.am_fragment
-
-# Post to the website.
-
-post-html-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) post-html); \
- done
-
-#post-html-local: index.html
-# scp $$SSH_OPT $^ $$USER $(web_host):$(web_path_docs)
-
-post-html: post-html-recursive
-
-doc-clean-recursive:
- list='$(SUBDIRS)'; for subdir in $$list; do \
- test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) doc-clean); \
- done
-
-doc-clean: doc-clean-recursive
-
-doc-rebuild: doc-clean all
-
-.PHONY: post-html post-html-local post-html-recursive doc-clean doc-clean-recursive doc-rebuild
-
+## Copyright (c) 2009 Openismus GmbH <http://www.openismus.com/>
+##
+## This file is part of gtkmm.
+##
+## gtkmm is free software: you can redistribute it and/or modify it
+## under the terms of the GNU Lesser General Public License as published
+## by the Free Software Foundation, either version 2.1 of the License,
+## or (at your option) any later version.
+##
+## gtkmm is distributed in the hope that it will be useful, but
+## WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+## See the GNU Lesser General Public License for more details.
+##
+## You should have received a copy of the GNU Lesser General Public License
+## along with this library. If not, see <http://www.gnu.org/licenses/>.
+
+include $(top_srcdir)/atk/src/filelist.am
+include $(top_srcdir)/atk/atkmm/filelist.am
+include $(top_srcdir)/gdk/src/filelist.am
+include $(top_srcdir)/gdk/gdkmm/filelist.am
+include $(top_srcdir)/gtk/src/filelist.am
+include $(top_srcdir)/gtk/gtkmm/filelist.am
+
+atkmm_files_h = $(atkmm_files_built_h) $(filter-out wrap_init.h,$(atkmm_files_extra_h))
+gdkmm_files_h = $(gdkmm_files_built_h) $(filter-out wrap_init.h,$(gdkmm_files_extra_h))
+gtkmm_files_h = $(gtkmm_files_built_h) $(filter-out wrap_init.h,$(gtkmm_files_extra_h))
+
+book_name = $(GTKMM_MODULE_NAME)
+doc_input = $(addprefix $(top_srcdir)/atk/atkmm/,$(atkmm_files_h)) \
+ $(addprefix $(top_srcdir)/gdk/gdkmm/,$(gdkmm_files_h)) \
+ $(addprefix $(top_srcdir)/gtk/gtkmm/,$(gtkmm_files_h))
+
+# Override the web location to use the old-style path with redundant
+# directory components.
+htmlrefpub = http://www.gtkmm.org/docs/$(book_name)/docs/reference/html
+
+docimagesdir = $(libdocdir)/images
+dist_docimages_DATA = images/gtkmm_logo.gif images/top.gif
+
+include $(top_srcdir)/scripts/doc-reference.am
+
+dist_noinst_DATA += \
+ reference/gtkmm_header.html_fragment \
+ reference/gtkmm_footer.html_fragment \
+ reference/widget_hierarchy.dia \
+ reference/widget_hierarchy.html \
+ reference/widget_hierarchy.png
diff --git a/docs/reference/Doxyfile.in b/docs/reference/Doxyfile.in
index 07a9a0b..246adc1 100644
--- a/docs/reference/Doxyfile.in
+++ b/docs/reference/Doxyfile.in
@@ -1,36 +1,41 @@
-# Doxyfile 1.4.6
+# Doxyfile 1.5.8
+# @configure_input@
#---------------------------------------------------------------------------
# Project related configuration options
#---------------------------------------------------------------------------
-PROJECT_NAME = "gtkmm 2.4"
-PROJECT_NUMBER =
-OUTPUT_DIRECTORY =
+DOXYFILE_ENCODING = UTF-8
+PROJECT_NAME = @PACKAGE_NAME@
+PROJECT_NUMBER = @GTKMM_API_VERSION@
+OUTPUT_DIRECTORY = reference
CREATE_SUBDIRS = NO
OUTPUT_LANGUAGE = English
-USE_WINDOWS_ENCODING = NO
BRIEF_MEMBER_DESC = YES
REPEAT_BRIEF = YES
-ABBREVIATE_BRIEF = "The $name class" \
- "The $name widget" \
- "The $name file" \
- is \
- provides \
- specifies \
- contains \
- represents \
- a \
- an \
- the
+ABBREVIATE_BRIEF =
ALWAYS_DETAILED_SEC = NO
INLINE_INHERITED_MEMB = NO
-FULL_PATH_NAMES = NO
-STRIP_FROM_PATH =
-STRIP_FROM_INC_PATH =
+FULL_PATH_NAMES = YES
+STRIP_FROM_PATH = "@abs_top_builddir@/atk/" \
+ "@abs_top_srcdir@/atk/" \
+ "@abs_top_builddir@/gdk/" \
+ "@abs_top_srcdir@/gdk/" \
+ "@abs_top_builddir@/gtk/" \
+ "@abs_top_srcdir@/gtk/" \
+ "@abs_top_builddir@/" \
+ "@abs_top_srcdir@/"
+STRIP_FROM_INC_PATH = "@abs_top_builddir@/atk/" \
+ "@abs_top_srcdir@/atk/" \
+ "@abs_top_builddir@/gdk/" \
+ "@abs_top_srcdir@/gdk/" \
+ "@abs_top_builddir@/gtk/" \
+ "@abs_top_srcdir@/gtk/" \
+ "@abs_top_builddir@/" \
+ "@abs_top_srcdir@/"
SHORT_NAMES = NO
JAVADOC_AUTOBRIEF = YES
+QT_AUTOBRIEF = NO
MULTILINE_CPP_IS_BRIEF = NO
-DETAILS_AT_TOP = YES
INHERIT_DOCS = YES
SEPARATE_MEMBER_PAGES = NO
TAB_SIZE = 8
@@ -45,38 +50,51 @@ ALIASES = "newin2p2=\xrefitem newin2p2s \"Since gtkmm 2.2\" \"New
"newin2p18=\xrefitem newin2p18s \"Since gtkmm 2.18\" \"New API in gtkmm 2.18\" \n"
OPTIMIZE_OUTPUT_FOR_C = NO
OPTIMIZE_OUTPUT_JAVA = NO
+OPTIMIZE_FOR_FORTRAN = NO
+OPTIMIZE_OUTPUT_VHDL = NO
+EXTENSION_MAPPING =
BUILTIN_STL_SUPPORT = NO
+CPP_CLI_SUPPORT = NO
+SIP_SUPPORT = NO
+IDL_PROPERTY_SUPPORT = YES
DISTRIBUTE_GROUP_DOC = NO
SUBGROUPING = YES
+TYPEDEF_HIDES_STRUCT = NO
+SYMBOL_CACHE_SIZE = 0
#---------------------------------------------------------------------------
# Build related configuration options
#---------------------------------------------------------------------------
EXTRACT_ALL = YES
EXTRACT_PRIVATE = NO
-EXTRACT_STATIC = YES
-EXTRACT_LOCAL_CLASSES = YES
+EXTRACT_STATIC = NO
+EXTRACT_LOCAL_CLASSES = NO
EXTRACT_LOCAL_METHODS = NO
+EXTRACT_ANON_NSPACES = NO
HIDE_UNDOC_MEMBERS = NO
-HIDE_UNDOC_CLASSES = NO
-HIDE_FRIEND_COMPOUNDS = NO
-HIDE_IN_BODY_DOCS = NO
+HIDE_UNDOC_CLASSES = YES
+HIDE_FRIEND_COMPOUNDS = YES
+HIDE_IN_BODY_DOCS = YES
INTERNAL_DOCS = NO
CASE_SENSE_NAMES = YES
HIDE_SCOPE_NAMES = NO
SHOW_INCLUDE_FILES = NO
INLINE_INFO = YES
SORT_MEMBER_DOCS = YES
-SORT_BRIEF_DOCS = YES
-SORT_BY_SCOPE_NAME = NO
-GENERATE_TODOLIST = YES
-GENERATE_TESTLIST = YES
-GENERATE_BUGLIST = YES
+SORT_BRIEF_DOCS = NO
+SORT_GROUP_NAMES = NO
+SORT_BY_SCOPE_NAME = YES
+GENERATE_TODOLIST = NO
+GENERATE_TESTLIST = NO
+GENERATE_BUGLIST = NO
GENERATE_DEPRECATEDLIST= YES
-ENABLED_SECTIONS =
-MAX_INITIALIZER_LINES = 30
+ENABLED_SECTIONS =
+MAX_INITIALIZER_LINES = 2
SHOW_USED_FILES = YES
-SHOW_DIRECTORIES = YES
-FILE_VERSION_FILTER =
+SHOW_DIRECTORIES = NO
+SHOW_FILES = NO
+SHOW_NAMESPACES = YES
+FILE_VERSION_FILTER =
+LAYOUT_FILE =
#---------------------------------------------------------------------------
# configuration options related to warning and progress messages
#---------------------------------------------------------------------------
@@ -86,32 +104,48 @@ WARN_IF_UNDOCUMENTED = YES
WARN_IF_DOC_ERROR = YES
WARN_NO_PARAMDOC = NO
WARN_FORMAT = "$file:$line: $text"
-WARN_LOGFILE =
+WARN_LOGFILE = reference/doxygen.log
#---------------------------------------------------------------------------
# configuration options related to the input files
#---------------------------------------------------------------------------
-INPUT = @GTKMM_DOXYGEN_INPUT@
-FILE_PATTERNS = *.h
+INPUT =
+INPUT_ENCODING = UTF-8
+FILE_PATTERNS =
RECURSIVE = NO
-EXCLUDE =
+EXCLUDE =
EXCLUDE_SYMLINKS = NO
-EXCLUDE_PATTERNS = */wrap_init.h
-EXAMPLE_PATH = @top_srcdir@/examples
-EXAMPLE_PATTERNS = *.h \
- *.cc
+EXCLUDE_PATTERNS =
+EXCLUDE_SYMBOLS = _* \
+ adaptor_trait \
+ basic_filebuf \
+ basic_streambuf \
+ binary_function \
+ char_traits \
+ internal \
+ pair \
+ unary_function
+EXAMPLE_PATH = "@abs_top_srcdir@/demos"
+EXAMPLE_PATTERNS = *.cc \
+ *.h
EXAMPLE_RECURSIVE = YES
-IMAGE_PATH = $(DOXYGEN_IMAGE_PATH) images/widgets
-INPUT_FILTER =
-FILTER_PATTERNS =
+IMAGE_PATH = "@abs_top_srcdir@/docs/reference/images/stock/16" \
+ "@abs_top_srcdir@/docs/reference/images/stock/20" \
+ "@abs_top_srcdir@/docs/reference/images/stock/24" \
+ "@abs_top_srcdir@/docs/reference/images/stock/32" \
+ "@abs_top_srcdir@/docs/reference/images/stock/48" \
+ "@abs_top_srcdir@/docs/reference/images/widgets"
+INPUT_FILTER =
+FILTER_PATTERNS =
FILTER_SOURCE_FILES = NO
#---------------------------------------------------------------------------
# configuration options related to source browsing
#---------------------------------------------------------------------------
SOURCE_BROWSER = NO
INLINE_SOURCES = NO
-STRIP_CODE_COMMENTS = NO
-REFERENCED_BY_RELATION = YES
-REFERENCES_RELATION = YES
+STRIP_CODE_COMMENTS = YES
+REFERENCED_BY_RELATION = NO
+REFERENCES_RELATION = NO
+REFERENCES_LINK_SOURCE = YES
USE_HTAGS = NO
VERBATIM_HEADERS = NO
#---------------------------------------------------------------------------
@@ -119,27 +153,41 @@ VERBATIM_HEADERS = NO
#---------------------------------------------------------------------------
ALPHABETICAL_INDEX = YES
COLS_IN_ALPHA_INDEX = 5
-IGNORE_PREFIX =
+IGNORE_PREFIX =
#---------------------------------------------------------------------------
# configuration options related to the HTML output
#---------------------------------------------------------------------------
GENERATE_HTML = YES
HTML_OUTPUT = html
HTML_FILE_EXTENSION = .html
-HTML_HEADER = @srcdir@/gtkmm_header.html_fragment
-HTML_FOOTER = @srcdir@/gtkmm_footer.html_fragment
-HTML_STYLESHEET =
+HTML_HEADER = "@abs_top_srcdir@/docs/reference/gtkmm_header.html_fragment"
+HTML_FOOTER = "@abs_top_srcdir@/docs/reference/gtkmm_footer.html_fragment"
+HTML_STYLESHEET =
HTML_ALIGN_MEMBERS = YES
+HTML_DYNAMIC_SECTIONS = NO
+GENERATE_DOCSET = NO
+DOCSET_FEEDNAME = "Doxygen generated docs"
+DOCSET_BUNDLE_ID = org.doxygen.Project
GENERATE_HTMLHELP = NO
-CHM_FILE =
-HHC_LOCATION =
+CHM_FILE =
+HHC_LOCATION =
GENERATE_CHI = NO
+CHM_INDEX_ENCODING =
BINARY_TOC = NO
TOC_EXPAND = NO
-DISABLE_INDEX = YES
+GENERATE_QHP = NO
+QCH_FILE =
+QHP_NAMESPACE =
+QHP_VIRTUAL_FOLDER = doc
+QHP_CUST_FILTER_NAME =
+QHP_CUST_FILTER_ATTRS =
+QHP_SECT_FILTER_ATTRS =
+QHG_LOCATION =
+DISABLE_INDEX = NO
ENUM_VALUES_PER_LINE = 1
-GENERATE_TREEVIEW = NO
+GENERATE_TREEVIEW = NONE
TREEVIEW_WIDTH = 250
+FORMULA_FONTSIZE = 10
#---------------------------------------------------------------------------
# configuration options related to the LaTeX output
#---------------------------------------------------------------------------
@@ -149,10 +197,10 @@ LATEX_CMD_NAME = latex
MAKEINDEX_CMD_NAME = makeindex
COMPACT_LATEX = NO
PAPER_TYPE = a4wide
-EXTRA_PACKAGES =
-LATEX_HEADER =
-PDF_HYPERLINKS = NO
-USE_PDFLATEX = NO
+EXTRA_PACKAGES =
+LATEX_HEADER =
+PDF_HYPERLINKS = YES
+USE_PDFLATEX = YES
LATEX_BATCHMODE = NO
LATEX_HIDE_INDICES = NO
#---------------------------------------------------------------------------
@@ -162,8 +210,8 @@ GENERATE_RTF = NO
RTF_OUTPUT = rtf
COMPACT_RTF = NO
RTF_HYPERLINKS = NO
-RTF_STYLESHEET_FILE =
-RTF_EXTENSIONS_FILE =
+RTF_STYLESHEET_FILE =
+RTF_EXTENSIONS_FILE =
#---------------------------------------------------------------------------
# configuration options related to the man page output
#---------------------------------------------------------------------------
@@ -174,11 +222,11 @@ MAN_LINKS = NO
#---------------------------------------------------------------------------
# configuration options related to the XML output
#---------------------------------------------------------------------------
-GENERATE_XML = YES
+GENERATE_XML = NO
XML_OUTPUT = xml
-XML_SCHEMA =
-XML_DTD =
-XML_PROGRAMLISTING = YES
+XML_SCHEMA =
+XML_DTD =
+XML_PROGRAMLISTING = NO
#---------------------------------------------------------------------------
# configuration options for the AutoGen Definitions output
#---------------------------------------------------------------------------
@@ -189,61 +237,84 @@ GENERATE_AUTOGEN_DEF = NO
GENERATE_PERLMOD = NO
PERLMOD_LATEX = NO
PERLMOD_PRETTY = YES
-PERLMOD_MAKEVAR_PREFIX =
+PERLMOD_MAKEVAR_PREFIX =
#---------------------------------------------------------------------------
-# Configuration options related to the preprocessor
+# Configuration options related to the preprocessor
#---------------------------------------------------------------------------
ENABLE_PREPROCESSING = YES
MACRO_EXPANSION = YES
EXPAND_ONLY_PREDEF = YES
-SEARCH_INCLUDES = NO
-INCLUDE_PATH =
-INCLUDE_FILE_PATTERNS =
-PREDEFINED = DOXYGEN_SHOULD_SKIP_THIS \
- GTKMM_USING_STD(x)= \
- GTKMM_API \
- GTKMM_ATKMM_ENABLED \
- GLIBMM_VFUNCS_ENABLED \
- GLIBMM_PROPERTIES_ENABLED \
+SEARCH_INCLUDES = YES
+INCLUDE_PATH = "@abs_top_builddir@/atk" \
+ "@abs_top_srcdir@/atk" \
+ "@abs_top_builddir@/gdk" \
+ "@abs_top_srcdir@/gdk" \
+ "@abs_top_builddir@/gtk" \
+ "@abs_top_srcdir@/gtk"
+INCLUDE_FILE_PATTERNS = *.h
+PREDEFINED = __cplusplus \
+ DOXYGEN_SHOULD_SKIP_THIS \
+ "G_GNUC_CONST=" \
+ "G_GNUC_NORETURN=" \
+ "G_GNUC_NULL_TERMINATED=" \
+ "G_GNUC_PURE=" \
+ GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED \
GLIBMM_EXCEPTIONS_ENABLED \
- GLIBMM_DEFAULT_SIGNAL_HANDLERS_ENABLED
-EXPAND_AS_DEFINED =
+ GLIBMM_HAVE_WIDE_STREAM \
+ GLIBMM_PROPERTIES_ENABLED \
+ GLIBMM_VFUNCS_ENABLED \
+ "GTKMM_API=" \
+ GTKMM_ATKMM_ENABLED \
+ "GTKMM_USING_STD(x)="
+EXPAND_AS_DEFINED = ATKMM_MAJOR_VERSION \
+ ATKMM_MINOR_VERSION \
+ ATKMM_MICRO_VERSION \
+ GDKMM_MAJOR_VERSION \
+ GDKMM_MINOR_VERSION \
+ GDKMM_MICRO_VERSION \
+ GTKMM_MAJOR_VERSION \
+ GTKMM_MINOR_VERSION \
+ GTKMM_MICRO_VERSION
SKIP_FUNCTION_MACROS = YES
#---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration::additions related to external references
#---------------------------------------------------------------------------
-TAGFILES = ../../../glibmm/docs/reference/glibmm_doxygen_tags ../../../pangomm/docs/reference/pangomm_doxygen_tags
-GENERATE_TAGFILE = gtkmm_doxygen_tags
-ALLEXTERNALS = YES
-EXTERNAL_GROUPS = YES
-PERL_PATH = @PERL_PATH@
+TAGFILES = @DOXYGEN_TAGFILES@
+GENERATE_TAGFILE = "reference/@GTKMM_MODULE_NAME tag"
+ALLEXTERNALS = NO
+EXTERNAL_GROUPS = NO
+PERL_PATH = @PERL@
#---------------------------------------------------------------------------
-# Configuration options related to the dot tool
+# Configuration options related to the dot tool
#---------------------------------------------------------------------------
-CLASS_DIAGRAMS = YES
+CLASS_DIAGRAMS = NO
+MSCGEN_PATH =
HIDE_UNDOC_RELATIONS = NO
HAVE_DOT = YES
+DOT_FONTNAME = FreeSans
+DOT_FONTSIZE = 10
+DOT_FONTPATH =
CLASS_GRAPH = YES
COLLABORATION_GRAPH = NO
GROUP_GRAPHS = YES
UML_LOOK = NO
-TEMPLATE_RELATIONS = NO
+TEMPLATE_RELATIONS = YES
INCLUDE_GRAPH = NO
INCLUDED_BY_GRAPH = NO
CALL_GRAPH = NO
+CALLER_GRAPH = NO
GRAPHICAL_HIERARCHY = YES
-DIRECTORY_GRAPH = YES
+DIRECTORY_GRAPH = NO
DOT_IMAGE_FORMAT = png
-DOT_PATH =
-DOTFILE_DIRS =
-MAX_DOT_GRAPH_WIDTH = 1024
-MAX_DOT_GRAPH_HEIGHT = 1024
+DOT_PATH =
+DOTFILE_DIRS =
+DOT_GRAPH_MAX_NODES = 50
MAX_DOT_GRAPH_DEPTH = 0
DOT_TRANSPARENT = NO
-DOT_MULTI_TARGETS = NO
+DOT_MULTI_TARGETS = YES
GENERATE_LEGEND = YES
DOT_CLEANUP = YES
#---------------------------------------------------------------------------
-# Configuration::additions related to the search engine
+# Options related to the search engine
#---------------------------------------------------------------------------
SEARCHENGINE = NO
diff --git a/gdk/gdkmm-2.4.pc.in b/gdk/gdkmm-2.4.pc.in
index c27b2fd..a2282c6 100644
--- a/gdk/gdkmm-2.4.pc.in
+++ b/gdk/gdkmm-2.4.pc.in
@@ -1,11 +1,19 @@
prefix= prefix@
exec_prefix= exec_prefix@
libdir= libdir@
+datarootdir= datarootdir@
+datadir= datadir@
includedir= includedir@
+docdir=${datarootdir}/doc/@GTKMM_MODULE_NAME@
+doxytagfile=${docdir}/reference/@GTKMM_MODULE_NAME tag
+htmlrefdir=${docdir}/reference/html
+htmlrefpub=http://www.gtkmm.org/docs/@GTKMM_MODULE_NAME@/docs/reference/html
+
Name: gdkmm
-Description: C++ wrappers for GLib, GTK+, and Pango
-Requires: glibmm-2.4 pangomm-1.4 gdk-2.0 cairomm-1.0
-Version: @VERSION@
-Libs: -L${libdir} -lgdkmm-2.4
-Cflags: -I${includedir}/gdkmm-2.4 -I${libdir}/gdkmm-2.4/include
+Description: C++ binding for the GDK drawing kit
+Version: @PACKAGE_VERSION@
+URL: http://www.gtkmm.org/
+Requires: @GDKMM_MODULES@
+Libs: -L${libdir} -lgdkmm- GDKMM_API_VERSION@
+Cflags: -I${includedir}/@GDKMM_MODULE_NAME@ -I${libdir}/@GDKMM_MODULE_NAME@/include
diff --git a/gtk/gtkmm-2.4.pc.in b/gtk/gtkmm-2.4.pc.in
index 41269a3..8d70482 100644
--- a/gtk/gtkmm-2.4.pc.in
+++ b/gtk/gtkmm-2.4.pc.in
@@ -1,11 +1,19 @@
prefix= prefix@
exec_prefix= exec_prefix@
libdir= libdir@
+datarootdir= datarootdir@
+datadir= datadir@
includedir= includedir@
+docdir=${datarootdir}/doc/@GTKMM_MODULE_NAME@
+doxytagfile=${docdir}/reference/@GTKMM_MODULE_NAME tag
+htmlrefdir=${docdir}/reference/html
+htmlrefpub=http://www.gtkmm.org/docs/@GTKMM_MODULE_NAME@/docs/reference/html
+
Name: gtkmm
-Description: C++ wrapper for GTK+
-Requires: glibmm-2.4 giomm-2.4 gdkmm-2.4 pangomm-1.4 @GTKMM_PC_ATKMM_DEP@ gtk+-2.0
-Version: @VERSION@
-Libs: -L${libdir} -lgtkmm-2.4
-Cflags: -I${includedir}/gtkmm-2.4 -I${libdir}/gtkmm-2.4/include
+Description: C++ binding for the GTK+ toolkit
+Version: @PACKAGE_VERSION@
+URL: http://www.gtkmm.org/
+Requires: @GTKMM_MODULES@ @GTKMM_PC_ATKMM_DEP@
+Libs: -L${libdir} -lgtkmm- GTKMM_API_VERSION@
+Cflags: -I${includedir}/@GTKMM_MODULE_NAME@ -I${libdir}/@GTKMM_MODULE_NAME@/include
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
