Add dlog.h.m4 for release/debug 87/42787/3 submit/tizen/20150702.125953
authorJae-young Hwang <j-zero.hwang@samsung.com>
Thu, 2 Jul 2015 08:50:15 +0000 (17:50 +0900)
committerJae-young Hwang <j-zero.hwang@samsung.com>
Thu, 2 Jul 2015 08:55:05 +0000 (17:55 +0900)
For checking and enabling engineer mode,
splite define with m4 Change-Id:

Change-Id: I86e2231dba3fd8e19b98d63225f13e2b5d91145e
Signed-off-by: Jae-young Hwang <j-zero.hwang@samsung.com>
Makefile.am
autogen.sh
configure.ac
include/dlog.h.m4 [moved from include/dlog.h with 99% similarity]

index d4ca6fd..935b673 100755 (executable)
@@ -1,4 +1,4 @@
-AUTOMAKE_OPTIONS = subdir-objects
+AUTOMAKE_OPTIONS = subdir-objects foreign
 
 AM_CFLAGS = -I$(srcdir)/include \
        $(DEBUG_CFLAGS) \
@@ -6,6 +6,7 @@ AM_CFLAGS = -I$(srcdir)/include \
        $(CAPI_BASE_COMMON_CFLAGS)
 
 dlog_includedir = $(includedir)/dlog
+
 dlog_include_HEADERS = \
        include/dlog.h
 
@@ -53,6 +54,9 @@ dlog_logger_SOURCES = \
        include/logger.h \
        include/logprint.h
 
+include/%: include/%.m4
+       m4 -P $(M4_DEFINES) < $< > $@
+
 # conf file
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dlog.pc
index 798eba2..7070b81 100755 (executable)
@@ -3,4 +3,3 @@ libtoolize --copy
 autoheader
 autoconf
 automake --add-missing --copy --foreign
-
index cbd9996..2de5159 100755 (executable)
@@ -17,6 +17,9 @@ AC_PROG_CC
 AC_PROG_GCC_TRADITIONAL
 AC_PROG_LIBTOOL
 
+AC_SUBST(M4_DEFINES)
+M4_DEFINES=
+
 # check for libsystemd-journal
 AC_ARG_WITH([systemd-journal],
        AS_HELP_STRING([--with-systemd-journal], [check for systemd-journal]),
@@ -44,6 +47,7 @@ AC_ARG_ENABLE([engineer_mode],
                engineer_mode=no)
 if test "x$engineer_mode" = "xyes" ; then
        DEBUG_CFLAGS+=" -DTIZEN_ENGINEER_MODE"
+       M4_DEFINES="$M4_DEFINES -DTIZEN_ENGINEER_MODE"
 fi
 AC_ARG_ENABLE([debug_enable],
        AS_HELP_STRING([--enable-debug_enable Turn on debug_enable]),
similarity index 99%
rename from include/dlog.h
rename to include/dlog.h.m4
index cefbe79..671da05 100755 (executable)
@@ -45,12 +45,12 @@ extern "C" {
 #define __MODULE__ (strrchr(__FILE__, '/') ? strrchr(__FILE__, '/') + 1 : __FILE__)
 #endif
 
-#ifdef TIZEN_ENGINEER_MODE
-#ifndef TIZEN_DEBUG_ENABLE
-#define TIZEN_DEBUG_ENABLE
-#endif
+m4_ifdef(`TIZEN_ENGINEER_MODE',
+#ifndef TIZEN_ENGINEER_MODE
+#define TIZEN_ENGINEER_MODE
 #endif
 
+)m4_dnl
 /**
  * @addtogroup CAPI_SYSTEM_DLOG
  * @{