Aac-eld add missing header according to RFC3640 3.3.6

[linphone] / gtk / Makefile.am

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 546e9f4943a582bff046a442b50d1bda48a0d7ea..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,15 +24,16 @@ EXTRA_DIST= $(PIXMAPS) \
                linphone.iss \
                $(LINPHONE_ICO_RC_FILE) \
                $(LINPHONE_ICO_FILE)
-
+               gtkrc \
+               gtkrc.mac
 
 if BUILD_GTK_UI
 
 BUILT_SOURCES=version_date.h
 
-bin_PROGRAMS=linphone-3
+bin_PROGRAMS=linphone
 
-linphone_3_SOURCES=    \
+linphone_SOURCES=      \
                        main.c \
                        propertybox.c \
                        friendlist.c \
@@ -40,26 +44,29 @@ linphone_3_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_3_LDADD=$(top_builddir)/oRTP/src/libortp.la \
-               $(top_builddir)/mediastreamer2/src/libmediastreamer.la \
-               $(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_3_LDADD+=linphone.res -lwininet
-linphone_3_LDFLAGS=-Wl,--export-all-symbols -mwindows
+linphone_LDADD+=linphone.res -lwininet
+linphone_LDFLAGS=-Wl,--export-all-symbols -mwindows
 else
-linphone_3_LDFLAGS=-export-dynamic
+linphone_LDFLAGS=-export-dynamic
 endif
 
 uidir=$(datadir)/linphone
@@ -69,13 +76,14 @@ endif
 
 
 AM_CFLAGS= -DIN_LINPHONE -I$(top_srcdir)/coreapi/ \
-               -I$(top_srcdir)/mediastreamer2/include/ \
+               $(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.in
+version_date.h: $(top_srcdir)/configure.ac
        echo "#define LINPHONE_VERSION_DATE \"$(VERSION)-`date +%y%m%d`\"" > $@
 
 newdate: