Merge commit 'bigon/configure-deprecated-flag'

[empathy.git] / libempathy-gtk / Makefile.am

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 01ca09563299ede4dd0395904d682da3d8f65486..6f3b99ba6e98282345e3ee69e858bbe9bb5c51e7 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -3,9 +3,10 @@ AM_CPPFLAGS =                                           \
        -I$(top_srcdir)                                 \
        -DDATADIR=\""$(datadir)"\"                      \
        -DPKGDATADIR=\""$(pkgdatadir)"\"                \
-       $(EMPATHY_CFLAGS)                               \
+       $(LIBEMPATHYGTK_CFLAGS)                         \
        $(ENCHANT_CFLAGS)                               \
-       $(WARN_CFLAGS)
+       $(WARN_CFLAGS)                                  \
+       $(DISABLE_DEPRECATED)
 
 BUILT_SOURCES =                                        \
        empathy-gtk-marshal.h                           \
@@ -27,15 +28,20 @@ libempathy_gtk_la_SOURCES =                 \
        empathy-cell-renderer-expander.c        \
        empathy-cell-renderer-text.c            \
        empathy-chat.c                          \
-       empathy-chat-simple-view.c              \
+       empathy-chat-text-view.c                \
        empathy-chat-view.c                     \
        empathy-conf.c                          \
        empathy-contact-dialogs.c               \
        empathy-contact-list-store.c            \
        empathy-contact-list-view.c             \
        empathy-contact-menu.c                  \
+       empathy-contact-selector.c              \
        empathy-contact-widget.c                \
        empathy-geometry.c                      \
+       empathy-audio-sink.c                    \
+       empathy-audio-src.c                     \
+       empathy-video-src.c                     \
+       empathy-video-widget.c                  \
        empathy-irc-network-dialog.c            \
        empathy-log-window.c                    \
        empathy-new-message-dialog.c            \
@@ -45,7 +51,6 @@ libempathy_gtk_la_SOURCES =                   \
        empathy-spell.c                         \
        empathy-spell-dialog.c                  \
        empathy-theme-boxes.c                   \
-       empathy-theme.c                         \
        empathy-theme-irc.c                     \
        empathy-theme-manager.c                 \
        empathy-ui-utils.c                      \
@@ -56,7 +61,7 @@ nodist_libempathy_gtk_la_SOURCES =\
        $(BUILT_SOURCES)
 
 libempathy_gtk_la_LIBADD =                     \
-       $(EMPATHY_LIBS)                         \
+       $(LIBEMPATHYGTK_LIBS)                   \
        $(ENCHANT_LIBS)                         \
        $(top_builddir)/libempathy/libempathy.la
 
@@ -75,15 +80,20 @@ libempathy_gtk_headers =                    \
        empathy-cell-renderer-expander.h        \
        empathy-cell-renderer-text.h            \
        empathy-chat.h                          \
-       empathy-chat-simple-view.h              \
+       empathy-chat-text-view.h                \
        empathy-chat-view.h                     \
        empathy-conf.h                          \
        empathy-contact-dialogs.h               \
        empathy-contact-list-store.h            \
        empathy-contact-list-view.h             \
        empathy-contact-menu.h                  \
+       empathy-contact-selector.h              \
        empathy-contact-widget.h                \
        empathy-geometry.h                      \
+       empathy-audio-sink.h                    \
+       empathy-audio-src.h                     \
+       empathy-video-src.h                     \
+       empathy-video-widget.h                  \
        empathy-images.h                        \
        empathy-irc-network-dialog.h            \
        empathy-log-window.h                    \
@@ -94,7 +104,6 @@ libempathy_gtk_headers =                     \
        empathy-spell.h                         \
        empathy-spell-dialog.h                  \
        empathy-theme-boxes.h                   \
-       empathy-theme.h                         \
        empathy-theme-irc.h                     \
        empathy-theme-manager.h                 \
        empathy-ui-utils.h
@@ -104,25 +113,25 @@ libempathy_gtk_include_HEADERS =          \
        $(libempathy_gtk_headers)               \
        empathy-gtk-enum-types.h
 
-gladedir = $(datadir)/empathy
-glade_DATA =                                   \
-       empathy-contact-widget.glade            \
-       empathy-contact-dialogs.glade           \
-       empathy-presence-chooser.glade          \
-       empathy-account-widget-generic.glade    \
-       empathy-account-widget-jabber.glade     \
-       empathy-account-widget-msn.glade        \
-       empathy-account-widget-sip.glade        \
-       empathy-account-widget-salut.glade      \
-       empathy-account-widget-irc.glade        \
-       empathy-account-widget-icq.glade        \
-       empathy-account-widget-yahoo.glade      \
-       empathy-account-widget-groupwise.glade  \
-       empathy-account-widget-aim.glade        \
-       empathy-spell-dialog.glade              \
-       empathy-log-window.glade                \
-       empathy-chat.glade                      \
-       empathy-new-message-dialog.glade
+uidir = $(datadir)/empathy
+ui_DATA =                                      \
+       empathy-contact-widget.ui               \
+       empathy-contact-dialogs.ui              \
+       empathy-presence-chooser.ui             \
+       empathy-account-widget-generic.ui       \
+       empathy-account-widget-jabber.ui        \
+       empathy-account-widget-msn.ui           \
+       empathy-account-widget-sip.ui           \
+       empathy-account-widget-salut.ui         \
+       empathy-account-widget-irc.ui           \
+       empathy-account-widget-icq.ui           \
+       empathy-account-widget-yahoo.ui         \
+       empathy-account-widget-groupwise.ui     \
+       empathy-account-widget-aim.ui           \
+       empathy-spell-dialog.ui                 \
+       empathy-log-window.ui                   \
+       empathy-chat.ui                         \
+       empathy-new-message-dialog.ui
 
 empathy-gtk-marshal.list: $(libempathy_gtk_la_SOURCES) Makefile.am
        ( cd $(srcdir) && \
@@ -184,7 +193,7 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libempathy-gtk.pc
 
 EXTRA_DIST =                   \
-       $(glade_DATA)
+       $(ui_DATA)
 
 CLEANFILES =                           \
        $(BUILT_SOURCES)                \