Merge remote-tracking branch 'origin/call1' into master+call

[empathy.git] / libempathy / Makefile.am

diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am
index b2c42f96c58f711389ea0be95c1b372b45e0a035..cc288bfa853edee3d2732ce3bad1f1e1c754553f 100644 (file)
--- a/libempathy/Makefile.am
+++ b/libempathy/Makefile.am
@@ -10,7 +10,6 @@ AM_CPPFLAGS =                                           \
        -DG_LOG_DOMAIN=\"empathy\"                      \
        -DGCR_API_SUBJECT_TO_CHANGE                     \
        $(EMPATHY_CFLAGS)                               \
-       $(YELL_CFLAGS)                                  \
        $(GEOCLUE_CFLAGS)                               \
        $(GEOCODE_CFLAGS)                               \
        $(NETWORK_MANAGER_CFLAGS)                       \
@@ -39,7 +38,6 @@ libempathy_headers =                          \
        empathy-connection-aggregator.h         \
        empathy-contact-groups.h                \
        empathy-contact-list.h                  \
-       empathy-contact-manager.h               \
        empathy-contact.h                       \
        empathy-debug.h                         \
        empathy-ft-factory.h                    \
@@ -53,6 +51,7 @@ libempathy_headers =                          \
        empathy-keyring.h                       \
        empathy-location.h                      \
        empathy-message.h                       \
+       empathy-pkg-kit.h               \
        empathy-request-util.h                  \
        empathy-server-sasl-handler.h           \
        empathy-server-tls-handler.h            \
@@ -63,7 +62,6 @@ libempathy_headers =                          \
        empathy-tp-chat.h                       \
        empathy-tp-contact-factory.h            \
        empathy-tp-contact-list.h               \
-       empathy-tp-file.h                       \
        empathy-tp-roomlist.h                   \
        empathy-tp-streamed-media.h             \
        empathy-types.h                         \
@@ -83,7 +81,6 @@ libempathy_handwritten_source =                               \
        empathy-connection-aggregator.c         \
        empathy-contact-groups.c                        \
        empathy-contact-list.c                          \
-       empathy-contact-manager.c                       \
        empathy-contact.c                               \
        empathy-debug.c                                 \
        empathy-ft-factory.c                            \
@@ -95,6 +92,7 @@ libempathy_handwritten_source =                               \
        empathy-irc-server.c                            \
        empathy-keyring.c                               \
        empathy-message.c                               \
+       empathy-pkg-kit.c               \
        empathy-request-util.c                          \
        empathy-server-sasl-handler.c                   \
        empathy-server-tls-handler.c                    \
@@ -105,7 +103,6 @@ libempathy_handwritten_source =                             \
        empathy-tp-chat.c                               \
        empathy-tp-contact-factory.c                    \
        empathy-tp-contact-list.c                       \
-       empathy-tp-file.c                               \
        empathy-tp-roomlist.c                           \
        empathy-tp-streamed-media.c                     \
        empathy-utils.c
@@ -151,7 +148,6 @@ nodist_libempathy_la_SOURCES =\
 
 libempathy_la_LIBADD =         \
        $(top_builddir)/extensions/libemp-extensions.la \
-       $(top_builddir)/telepathy-yell/telepathy-yell/libtelepathy-yell.la \
        $(GCR_LIBS) \
        $(EMPATHY_LIBS) \
        $(GEOCLUE_LIBS) \