diff options
author | Imran Zaman <imran.zaman@intel.com> | 2014-07-04 16:12:15 +0300 |
---|---|---|
committer | Imran Zaman <imran.zaman@intel.com> | 2014-07-04 16:12:28 +0300 |
commit | 3b020093ac6bcc6ef4ccd8a9ecd6286f136f26d6 (patch) | |
tree | 49ed4213d7d8a62962efb4976f04f81fdbc3c70f | |
parent | 34cf061360a6bc96e56fb355522ba9eb436755df (diff) | |
parent | 031ece5a7b5fc4a14a6577759b2c53716873510a (diff) | |
download | gsignond-3b020093ac6bcc6ef4ccd8a9ecd6286f136f26d6.tar.gz gsignond-3b020093ac6bcc6ef4ccd8a9ecd6286f136f26d6.tar.bz2 gsignond-3b020093ac6bcc6ef4ccd8a9ecd6286f136f26d6.zip |
Merge branch 'upstream' into tizensubmit/tizen/20140704.131349accepted/tizen/common/20140722.142853
Change-Id: Id5eb12c33bfabbe12a57ad3c151b359128ed00da
Signed-off-by: Imran Zaman <imran.zaman@intel.com>
-rwxr-xr-x | configure | 2 | ||||
-rw-r--r-- | configure.ac | 2 | ||||
-rwxr-xr-x | dists/debian/rules | 2 | ||||
-rw-r--r-- | docs/html/api-index-full.html | 4 | ||||
-rw-r--r-- | include/gsignond/gsignond-log.h | 2 |
5 files changed, 7 insertions, 5 deletions
@@ -13032,6 +13032,8 @@ GSIGNOND_CFLAGS="$GSIGNOND_CFLAGS -D_POSIX_C_SOURCE=\\\"200809L\\\" -D_GNU_SOURC GSIGNOND_CFLAGS="$GSIGNOND_CFLAGS -Wall -DG_LOG_DOMAIN=\\\"gsignond\\\"" if test "x$enable_debug" = "xno" ; then GSIGNOND_CFLAGS="$GSIGNOND_CFLAGS -Werror" +else + GSIGNOND_CFLAGS="$GSIGNOND_CFLAGS -DENABLE_DEBUG" fi # GSIGNOND_LIBS="$GSIGNOND_LIBS -lduma" diff --git a/configure.ac b/configure.ac index 579ac5c..c7b43bf 100644 --- a/configure.ac +++ b/configure.ac @@ -177,6 +177,8 @@ GSIGNOND_CFLAGS="$GSIGNOND_CFLAGS -D_POSIX_C_SOURCE=\\\"200809L\\\" -D_GNU_SOURC GSIGNOND_CFLAGS="$GSIGNOND_CFLAGS -Wall -DG_LOG_DOMAIN=\\\"gsignond\\\"" if test "x$enable_debug" = "xno" ; then GSIGNOND_CFLAGS="$GSIGNOND_CFLAGS -Werror" +else + GSIGNOND_CFLAGS="$GSIGNOND_CFLAGS -DENABLE_DEBUG" fi # GSIGNOND_LIBS="$GSIGNOND_LIBS -lduma" diff --git a/dists/debian/rules b/dists/debian/rules index 55bee4d..c59a978 100755 --- a/dists/debian/rules +++ b/dists/debian/rules @@ -16,7 +16,7 @@ export DH_OPTIONS dh $@ --parallel override_dh_auto_configure: - dh_auto_configure -- --enable-dbus-type=session --enable-gtk-doc --enable-debug + dh_auto_configure -- --enable-dbus-type=session --enable-gtk-doc override_dh_auto_test: true diff --git a/docs/html/api-index-full.html b/docs/html/api-index-full.html index 503f5ef..8df48b8 100644 --- a/docs/html/api-index-full.html +++ b/docs/html/api-index-full.html @@ -277,11 +277,11 @@ </dt> <dd></dd> <dt> -<a class="link" href="gsignond-Errors.html#GSIGNOND-ERROR:CAPS" title="GSIGNOND_ERROR">GSIGNOND_ERROR</a>, macro in <a class="link" href="gsignond-Errors.html" title="Errors">Errors</a> +<a class="link" href="gsignond-Errors.html#GSignondError" title="enum GSignondError">GSignondError</a>, enum in <a class="link" href="gsignond-Errors.html" title="Errors">Errors</a> </dt> <dd></dd> <dt> -<a class="link" href="gsignond-Errors.html#GSignondError" title="enum GSignondError">GSignondError</a>, enum in <a class="link" href="gsignond-Errors.html" title="Errors">Errors</a> +<a class="link" href="gsignond-Errors.html#GSIGNOND-ERROR:CAPS" title="GSIGNOND_ERROR">GSIGNOND_ERROR</a>, macro in <a class="link" href="gsignond-Errors.html" title="Errors">Errors</a> </dt> <dd></dd> <dt> diff --git a/include/gsignond/gsignond-log.h b/include/gsignond/gsignond-log.h index fcb65e0..ad1e6e0 100644 --- a/include/gsignond/gsignond-log.h +++ b/include/gsignond/gsignond-log.h @@ -25,8 +25,6 @@ #ifndef __GSIGNOND_LOG_H_ #define __GSIGNOND_LOG_H_ -#include "config.h" - #include <glib.h> #include <execinfo.h> |