update ms2 and cleanup dead function

[linphone] / gtk / Makefile.am

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 58f5306596b972c31ac4c72e8dd6f45268d7ba25..ba965b69ad27cdde0d0896f1b8fc51ee303033ab 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -4,11 +4,14 @@ UI_FILES=     about.ui \
                contact.ui \
                parameters.ui \
                sip_account.ui \
-               chatroom.ui \
                call_logs.ui \
+               keypad.ui \
                log.ui \
                buddylookup.ui \
-               waiting.ui
+               tunnel_config.ui \
+               waiting.ui \
+               dscp_settings.ui \
+               call_statistics.ui
 
 PIXMAPS=       \
                stock_people.png 
@@ -21,7 +24,8 @@ EXTRA_DIST=   $(PIXMAPS) \
                linphone.iss \
                $(LINPHONE_ICO_RC_FILE) \
                $(LINPHONE_ICO_FILE)
-
+               gtkrc \
+               gtkrc.mac
 
 if BUILD_GTK_UI
 
@@ -40,21 +44,24 @@ linphone_SOURCES=   \
                        update.c \
                        buddylookup.c \
                        utils.c \
-                       setupwizard.c\
                        incall_view.c \
                        loginframe.c \
+                       singleinstance.c \
+                       conference.c \
                        linphone.h 
+if BUILD_WIZARD
+linphone_SOURCES+=     \
+                       setupwizard.c
+endif
 
-linphone_LDADD=$(ORTP_LIBS) \
-               $(MEDIASTREAMER_LIBS) \
-               $(top_builddir)/coreapi/liblinphone.la \
-                       $(LIBGTK_LIBS) $(INTLLIBS) 
+linphone_LDADD=        $(top_builddir)/coreapi/liblinphone.la \
+               $(LIBGTK_LIBS) $(NOTIFY1_LIBS) $(NOTIFY4_LIBS) $(LIBGTKMAC_LIBS) $(INTLLIBS) $(SQLITE3_LIBS)
 
 
 if BUILD_WIN32
 
 linphone.res:  $(LINPHONE_ICO_RC_FILE) $(LINPHONE_ICO_FILE)
-       windres $(LINPHONE_ICO_RC_FILE) -O coff -o linphone.res
+       windres $(srcdir)/$(LINPHONE_ICO_RC_FILE) -O coff -o linphone.res
 
 linphone_LDADD+=linphone.res -lwininet
 linphone_LDFLAGS=-Wl,--export-all-symbols -mwindows
@@ -71,8 +78,9 @@ endif
 AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
                $(MEDIASTREAMER_CFLAGS) \
                $(ORTP_CFLAGS) \
-               $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(IPV6_CFLAGS) \
-               $(OSIP_CFLAGS) 
+               $(STRICT_OPTIONS) $(LIBGTK_CFLAGS) $(LIBGTKMAC_CFLAGS) $(IPV6_CFLAGS) \
+               $(TUNNEL_CFLAGS) \
+               $(SQLITE3_CFLAGS)
 
 
 version_date.h: $(top_srcdir)/configure.ac