merge git work

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

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index 7b0a9db290f6d5aa289a84166162039e36dec477..494e3c4ce8e6978469c7ce676194b8f2045322db 100644 (file)
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -12,7 +12,7 @@ BUILT_SOURCES =                                       \
 lib_LTLIBRARIES = libempathy-gtk.la
 
 libempathy_gtk_la_SOURCES =                    \
-       ephy-spinner.c  ephy-spinner.h          \
+       ephy-spinner.c ephy-spinner.h           \
        empathy-main-window.c                   \
        empathy-status-icon.c                   \
        empathy-contact-widget.c                \
@@ -20,16 +20,24 @@ libempathy_gtk_la_SOURCES =                 \
        empathy-accounts-dialog.c               \
        empathy-account-widget-generic.c        \
        empathy-account-widget-jabber.c         \
+       empathy-account-widget-msn.c            \
+       empathy-account-widget-salut.c          \
        empathy-profile-chooser.c               \
        empathy-cell-renderer-expander.c        \
        empathy-cell-renderer-text.c            \
+       empathy-cell-renderer-activatable.c     \
        empathy-spell.c                         \
        empathy-spell-dialog.c                  \
        empathy-contact-groups.c                \
        empathy-contact-list-store.c            \
        empathy-contact-list-view.c             \
        empathy-preferences.c                   \
+       empathy-theme.c                                 \
+       empathy-theme-boxes.c                   \
+       empathy-theme-irc.c                             \
        empathy-theme-manager.c                 \
+       empathy-theme-utils.c                   \
+       empathy-smiley-manager.c                \
        empathy-chat-window.c                   \
        empathy-chat.c                          \
        empathy-chat-view.c                     \
@@ -43,8 +51,11 @@ libempathy_gtk_la_SOURCES =                  \
        empathy-new-chatroom-dialog.c           \
        empathy-chatrooms-window.c              \
        empathy-log-window.c                    \
+       empathy-call-window.c                   \
+       empathy-avatar-chooser.c                \
+       empathy-avatar-image.c                  \
        empathy-ui-utils.c                      \
-       empathy-account-widget-msn.c
+       empathy-new-message-dialog.c
 
 # do not distribute generated files
 nodist_libempathy_gtk_la_SOURCES =\
@@ -66,16 +77,24 @@ libempathy_gtk_headers =                    \
        empathy-accounts-dialog.h               \
        empathy-account-widget-generic.h        \
        empathy-account-widget-jabber.h         \
+       empathy-account-widget-msn.h            \
+       empathy-account-widget-salut.h          \
        empathy-profile-chooser.h               \
        empathy-cell-renderer-expander.h        \
        empathy-cell-renderer-text.h            \
+       empathy-cell-renderer-activatable.h     \
        empathy-spell.h                         \
        empathy-spell-dialog.h                  \
        empathy-contact-groups.h                \
        empathy-contact-list-store.h            \
        empathy-contact-list-view.h             \
        empathy-preferences.h                   \
+       empathy-theme.h                                 \
+       empathy-theme-boxes.h                   \
+       empathy-theme-irc.h                             \
        empathy-theme-manager.h                 \
+       empathy-theme-utils.h                   \
+       empathy-smiley-manager.h                \
        empathy-chat-window.h                   \
        empathy-chat.h                          \
        empathy-chat-view.h                     \
@@ -89,8 +108,11 @@ libempathy_gtk_headers =                    \
        empathy-new-chatroom-dialog.h           \
        empathy-chatrooms-window.h              \
        empathy-log-window.h                    \
+       empathy-call-window.h                   \
+       empathy-avatar-chooser.h                \
+       empathy-avatar-image.h                  \
        empathy-ui-utils.h                      \
-       empathy-account-widget-msn.h
+       empathy-new-message-dialog.h
 
 libempathy_gtk_includedir = $(includedir)/libempathy-gtk/
 libempathy_gtk_include_HEADERS =               \
@@ -107,13 +129,16 @@ glade_DATA =                                      \
        empathy-presence-chooser.glade          \
        empathy-accounts-dialog.glade           \
        empathy-account-widget-jabber.glade     \
+       empathy-account-widget-msn.glade        \
+       empathy-account-widget-salut.glade      \
        empathy-new-chatroom-dialog.glade       \
        empathy-group-chat.glade                \
        empathy-chatrooms-window.glade          \
        empathy-spell-dialog.glade              \
        empathy-log-window.glade                \
-       empathy-chat.glade                     \
-       empathy-account-widget-msn.glade
+       empathy-call-window.glade               \
+       empathy-chat.glade                      \
+       empathy-new-message-dialog.glade
 
 empathy-gtk-enum-types.h: stamp-empathy-gtk-enum-types.h
        @true