Merge 1. Support DOCK Audio 2. Fix build breaks

[framework/multimedia/libmm-sound.git] / server / Makefile.am

diff --git a/server/Makefile.am b/server/Makefile.am
index 303e35a..8509f7e 100644 (file)
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -4,6 +4,11 @@ bin_PROGRAMS = sound_server
 sound_server_SOURCES = mm_sound_mgr_codec.c \
                                                mm_sound_mgr_ipc.c \
                                                mm_sound_mgr_pulse.c \
+                                               mm_sound_mgr_asm.c \
+                                               mm_sound_mgr_device.c \
+                                               mm_sound_mgr_headset.c \
+                                               mm_sound_mgr_dock.c \
+                                               mm_sound_mgr_session.c \
                                                mm_sound_mgr_run.c \
                                                mm_sound_plugin.c \
                                                mm_sound_server.c \
@@ -16,6 +21,7 @@ sound_server_CFLAGS = -I$(srcdir)/../include \
                                          $(MMLOGSVR_CFLAGS) \
                                          -DMMF_LOG_OWNER=0x020 \
                                          -DMMF_DEBUG_PREFIX=\"MMF-SOUND\" \
+                                         -D__DEBUG_MODE__ -DUSE_VCONF -D__USE_LOGMANAGER__ \
                                          $(MMSESSION_CFLAGS) \
                                          $(AVSYSTEM_CFLAGS) \
                                          $(AUDIOSESSIONMGR_CFLAGS) \
@@ -28,15 +34,21 @@ sound_server_LDADD = $(MMLOGSVR_LIBS) \
                     $(MMCOMMON_LIBS) \
                     $(MMSESSION_LIBS) \
                     $(AVSYSTEM_LIBS) \
-                        $(AUDIOSESSIONMGR_LIBS) \
-                        $(GLIB2_LIBS) \
-                        $(VCONF_LIBS) \
-                        $(HEYNOTI_LIBS) \
-                        $(srcdir)/../common/libmmfsoundcommon.la 
+                    $(AUDIOSESSIONMGR_LIBS) \
+                    $(GLIB2_LIBS) \
+                    $(VCONF_LIBS) \
+                    $(HEYNOTI_LIBS) \
+                    $(srcdir)/../libmmfsound.la \
+                    $(srcdir)/../common/libmmfsoundcommon.la 
 
 if USE_PULSE
 sound_server_CFLAGS += -DPULSE_CLIENT $(PULSE_CFLAGS)
 sound_server_LDADD += $(PULSE_LIBS)
 endif
 
+if USE_SECURITY
+sound_server_CFLAGS += $(SECURITY_CFLAGS) -DUSE_SECURITY
+sound_server_LDADD += $(SECURITY_LIBS)
+endif
+
 sound_server_DEPENDENCIES = $(srcdir)/../common/libmmfsoundcommon.la