diff options
author | inhyeok <i_bc.kim@samsung.com> | 2015-06-25 16:49:28 +0900 |
---|---|---|
committer | inhyeok <i_bc.kim@samsung.com> | 2015-06-26 11:07:41 +0900 |
commit | 7e72265b2a4deca07195129f428769811ea3873d (patch) | |
tree | a22a64344848526120270a6e9fed00f89fe4adcc /Makefile.am | |
parent | cba5a315ca8abb87ec935048647feaa129f5c277 (diff) | |
download | audio-session-manager-7e72265b2a4deca07195129f428769811ea3873d.tar.gz audio-session-manager-7e72265b2a4deca07195129f428769811ea3873d.tar.bz2 audio-session-manager-7e72265b2a4deca07195129f428769811ea3873d.zip |
Merge based 2.4tizen_3.0.m2.a1_tv_releasetizen_3.0.m2.a1_mobile_releasetizen_3.0.m1_tv_releasetizen_3.0.m1_mobile_releasesubmit/tizen_common/20151026.085049submit/tizen_common/20151023.083358submit/tizen_common/20151019.135620submit/tizen_common/20151015.190624submit/tizen/20150716.043920submit/tizen/20150715.102326submit/tizen/20150715.092047accepted/tizen/wearable/20150717.002925accepted/tizen/wearable/20150716.061216accepted/tizen/tv/20150717.002910accepted/tizen/tv/20150716.061203accepted/tizen/mobile/20150717.002856accepted/tizen/mobile/20150716.061158tizen_3.0.m1_tvtizen_3.0.m1_mobile
[Version] Release 0.3.0
[Profile] Common
[Issue Type] Migration
Merged main changes
- Update vconftool for SoundStatus initialize
- Apply ASLR
- Replace msgqueue to gdbus
- Revise return value of asm callback in asm_testsuite
- Support container
Change-Id: If8fc14a03f1f00a45c7163d9f21a8df8de04f559
Signed-off-by: inhyeok <i_bc.kim@samsung.com>
Diffstat (limited to 'Makefile.am')
-rw-r--r-- | Makefile.am | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 89b325d..ec59cde 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,7 +4,7 @@ SUBDIRS = . \ AM_CFLAGS = $(AUDIOSESSIONMGR_CFLAGS) lib_LTLIBRARIES = libaudio-session-mgr.la -libaudio_session_mgr_la_SOURCES = $(srcdir)/src/audio-session-mgr.c +libaudio_session_mgr_la_SOURCES = $(srcdir)/src/audio-session-mgr.c libaudio_session_mgr_la_LIBADD = $(AUDIOSESSIONMGR_LIBS) $(VCONF_LIBS) $(MMCOMMON_LIBS) libaudio_session_mgr_la_LDFLAGS = -Wl,-init, __ASM_init_module @@ -12,6 +12,11 @@ libaudio_session_mgr_la_LDFLAGS += -Wl,-fini, __ASM_fini_module libaudio_session_mgr_la_CPPFLAGS = -I$(srcdir)/include -DUSE_VCONF $(VCONF_CFLAGS) $(MMCOMMON_CFLAGS) +if USE_SECURITY +libaudio_session_mgr_la_CPPFLAGS += $(SECURITY_CFLAGS) -DUSE_SECURITY +libaudio_session_mgr_la_LIBADD += $(SECURITY_LIBS) +endif + libaudio_session_mgr_la_CPPFLAGS += $(MMLOG_CFLAGS) -DMMF_LOG_OWNER=0x00800000 -DMMF_DEBUG_PREFIX=\"MMF-SESSIONMGR\" libaudio_session_mgr_la_LIBADD += $(MMLOG_LIBS) |