Skip to content

Commit d11e685

Browse files
author
Kjell Ahlstedt
committed
Build: Fix silent builds
* configure.ac: Pass yes to AM_SILENT_RULES, thus enabling silent builds. Require mm-common 0.9.10 (not necessary for silent builds, but necessary when MM_AX_CXX_COMPILE_STDCXX is used). * docs/reference/Doxyfile.in: Set QUIET=YES. Update for doxygen 1.8.11 (not necessary for silent builds). Bug #768797
1 parent f71c65e commit d11e685

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

configure.ac

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,13 @@ AC_CONFIG_MACRO_DIR([build])
2626
AC_CONFIG_HEADERS([config.h sigc++config.h])
2727

2828
AM_INIT_AUTOMAKE([1.9 -Wno-portability check-news dist-bzip2 no-define nostdinc tar-ustar])
29-
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
29+
# Support silent build rules.
30+
# Disable by either passing --disable-silent-rules to configure or passing V=1 to make.
31+
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
3032
AM_MAINTAINER_MODE
3133
AC_ARG_VAR([ACLOCAL_FLAGS], [aclocal flags, e.g. -I <macro dir>])
3234

33-
MM_PREREQ([0.9.8])
35+
MM_PREREQ([0.9.10])
3436
MM_INIT_MODULE([sigc++-3.0])
3537
MM_CONFIG_DOCTOOL_DIR([docs])
3638

docs/reference/Doxyfile.in

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Doxyfile 1.8.9.1
1+
# Doxyfile 1.8.11
22
# @configure_input@
33

44
#---------------------------------------------------------------------------
@@ -45,6 +45,7 @@ CPP_CLI_SUPPORT = NO
4545
SIP_SUPPORT = NO
4646
IDL_PROPERTY_SUPPORT = YES
4747
DISTRIBUTE_GROUP_DOC = NO
48+
GROUP_NESTED_COMPOUNDS = NO
4849
SUBGROUPING = YES
4950
INLINE_GROUPED_CLASSES = NO
5051
INLINE_SIMPLE_STRUCTS = NO
@@ -93,11 +94,12 @@ CITE_BIB_FILES =
9394
#---------------------------------------------------------------------------
9495
# Configuration options related to warning and progress messages
9596
#---------------------------------------------------------------------------
96-
QUIET = NO
97+
QUIET = YES
9798
WARNINGS = YES
9899
WARN_IF_UNDOCUMENTED = YES
99100
WARN_IF_DOC_ERROR = YES
100101
WARN_NO_PARAMDOC = NO
102+
WARN_AS_ERROR = NO
101103
WARN_FORMAT = "$file:$line: $text"
102104
WARN_LOGFILE = reference/doxygen.log
103105
#---------------------------------------------------------------------------
@@ -140,6 +142,8 @@ REFERENCES_LINK_SOURCE = YES
140142
SOURCE_TOOLTIPS = YES
141143
USE_HTAGS = NO
142144
VERBATIM_HEADERS = NO
145+
CLANG_ASSISTED_PARSING = NO
146+
CLANG_OPTIONS =
143147
#---------------------------------------------------------------------------
144148
# Configuration options related to the alphabetical class index
145149
#---------------------------------------------------------------------------
@@ -224,6 +228,7 @@ LATEX_BATCHMODE = NO
224228
LATEX_HIDE_INDICES = NO
225229
LATEX_SOURCE_CODE = NO
226230
LATEX_BIB_STYLE = plain
231+
LATEX_TIMESTAMP = NO
227232
#---------------------------------------------------------------------------
228233
# Configuration options related to the RTF output
229234
#---------------------------------------------------------------------------
@@ -281,7 +286,7 @@ PREDEFINED = __cplusplus \
281286
SIGC_CONFIGURE \
282287
SIGC_GCC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD \
283288
SIGC_MSVC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD \
284-
SIGC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD"
289+
SIGC_TEMPLATE_SPECIALIZATION_OPERATOR_OVERLOAD
285290
EXPAND_AS_DEFINED = SIGC_WORKAROUND_OPERATOR_PARENTHESES \
286291
SIGCXX_MAJOR_VERSION \
287292
SIGCXX_MINOR_VERSION \

0 commit comments

Comments
 (0)