update ms2 and cleanup dead function

[linphone] / gtk / Makefile.am

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 111be5cb8c81e69d872d1a6949a666537053a63e..ba965b69ad27cdde0d0896f1b8fc51ee303033ab 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -4,8 +4,8 @@ UI_FILES=       about.ui \
                contact.ui \
                parameters.ui \
                sip_account.ui \
-               chatroom.ui \
                call_logs.ui \
+               keypad.ui \
                log.ui \
                buddylookup.ui \
                tunnel_config.ui \
@@ -54,11 +54,8 @@ linphone_SOURCES+=   \
                        setupwizard.c
 endif
 
-linphone_LDADD=\
-               $(top_builddir)/coreapi/liblinphone.la \
-               $(ORTP_LIBS) \
-               $(MEDIASTREAMER_LIBS) \
-               $(LIBGTK_LIBS) $(NOTIFY1_LIBS) $(NOTIFY4_LIBS) $(LIBGTKMAC_LIBS) $(INTLLIBS) 
+linphone_LDADD=        $(top_builddir)/coreapi/liblinphone.la \
+               $(LIBGTK_LIBS) $(NOTIFY1_LIBS) $(NOTIFY4_LIBS) $(LIBGTKMAC_LIBS) $(INTLLIBS) $(SQLITE3_LIBS)
 
 
 if BUILD_WIN32
@@ -82,7 +79,8 @@ AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
                $(MEDIASTREAMER_CFLAGS) \
                $(ORTP_CFLAGS) \
                $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(LIBGTKMAC_CFLAGS) $(IPV6_CFLAGS) \
-               $(TUNNEL_CFLAGS)
+               $(TUNNEL_CFLAGS) \
+               $(SQLITE3_CFLAGS)
 
 
 version_date.h: $(top_srcdir)/configure.ac