fixup! Fix Coverity defects

[platform/core/multimedia/libmm-sound.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0714084..d3a162c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,54 +4,67 @@ SUBDIRS = common \
                server \
                testsuite
 
+if USE_FOCUS
+SUBDIRS += focus_server
+endif
+
 lib_LTLIBRARIES = libmmfsound.la
 
 includelibmmfsounddir = $(includedir)/mmf
 includelibmmfsound_HEADERS = include/mm_sound.h \
                                                        include/mm_sound_private.h \
-                                                       server/include/mm_sound_plugin.h \
-                                                       server/include/mm_sound_plugin_hal.h
+                                                       include/mm_sound_pa_client.h \
+                                                       include/mm_sound_device.h
 
 libmmfsound_la_SOURCES = mm_sound.c \
-                       mm_sound_client.c 
+                       mm_sound_client.c \
+                       mm_sound_proxy.c \
+                       mm_sound_device.c \
+                       mm_sound_pa_client.c
+if USE_FOCUS
+includelibmmfsound_HEADERS += include/mm_sound_focus.h \
+                               include/mm_sound_focus_socket.h
+libmmfsound_la_SOURCES += mm_sound_focus.c \
+                               mm_sound_focus_socket.c
+endif
 
 libmmfsound_la_DEPENDENCIES = common/libmmfsoundcommon.la
-                                                               
 
 libmmfsound_la_CFLAGS = -I$(srcdir)/include \
                        $(MMCOMMON_CFLAGS) \
                        $(VCONF_CFLAGS) \
                        -I$(srcdir)/servertype/include \
-                       $(AVSYSTEM_CFLAGS) \
                        $(GLIB2_CFLAGS) \
+                       $(GIO_CFLAGS) \
                        $(MMSESSION_CFLAGS) \
-                       $(AUDIOSESSIONMGR_CFLAGS) \
                        -D_USE_INTERNAL_SOUND_PATH_ \
+                       $(PASIMPLE_CFLAGS) \
+                       $(PA_CFLAGS) \
                        $(VCONF_CFLAGS)
 
 if USE_PULSE
 libmmfsound_la_CFLAGS += -DPULSE_CLIENT
 endif
-                       
 
 libmmfsound_la_LIBADD = $(MMCOMMON_LIBS) \
-                       $(AVSYSTEM_LIBS) \
                        $(MMSESSION_LIBS) \
-                       $(AUDIOSESSIONMGR_LIBS) \
                        $(GLIB2_LIBS) \
+                       $(GIO_LIBS) \
                        $(srcdir)/common/libmmfsoundcommon.la \
+                       $(PASIMPLE_LIBS) \
+                       $(PA_LIBS) \
                        $(VCONF_LIBS)
-                       
+
+
 libmmfsound_la_LDFLAGS = -version-info 1:0:1
 
 #For logmanager
 libmmfsound_la_CFLAGS += $(MMLOGSVR_CFLAGS) -DMMF_LOG_OWNER=0x020 -DMMF_DEBUG_PREFIX=\"MMF-SOUND\"
 libmmfsound_la_LIBADD += $(MMLOGSVR_LIBS)
 
-
-
-
-
+if USE_FOCUS
+libmmfsound_la_CFLAGS += -DUSE_FOCUS
+endif
 
 
 lib_LTLIBRARIES += libmmfkeysound.la
@@ -62,8 +75,24 @@ libmmfkeysound_la_SOURCES = mm_sound_keysound.c
 
 libmmfkeysound_la_CFLAGS = -I$(srcdir)/include \
                        $(MMCOMMON_CFLAGS) \
+                       $(VCONF_CFLAGS) \
+                       $(GIO_CFLAGS) \
                        -D_USE_INTERNAL_SOUND_PATH_
 
-libmmfkeysound_la_LIBADD = $(MMCOMMON_LIBS)
+libmmfkeysound_la_LIBADD = $(MMCOMMON_LIBS) $(VCONF_LIBS) $(GIO_LIBS)
 libmmfkeysound_la_CFLAGS += $(MMLOGSVR_CFLAGS) -DMMF_LOG_OWNER=0x020 -DMMF_DEBUG_PREFIX=\"MMF-SOUND\"
 libmmfkeysound_la_LIBADD += $(MMLOGSVR_LIBS)
+
+lib_LTLIBRARIES += libmmfbootsound.la
+
+includelibmmfbootsounddir = $(includedir)/mmf
+
+libmmfbootsound_la_SOURCES = mm_sound_bootsound.c
+libmmfbootsound_la_CFLAGS = -I$(srcdir)/include \
+                       $(MMCOMMON_CFLAGS) \
+                       $(VCONF_CFLAGS) \
+                       -D_USE_INTERNAL_SOUND_PATH_
+
+libmmfbootsound_la_LIBADD = $(MMCOMMON_LIBS) $(VCONF_LIBS)
+libmmfbootsound_la_CFLAGS += $(MMLOGSVR_CFLAGS) -DMMF_LOG_OWNER=0x020 -DMMF_DEBUG_PREFIX=\"MMF-SOUND\"
+libmmfbootsound_la_LIBADD += $(MMLOGSVR_LIBS)