Merge branch 'log-window-webview'

[empathy.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index c232652c1061840920e0f8821e176980dc4dc2fb..0232ffe0ae57443fe728c4097ac3972f4444d633 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -16,7 +16,6 @@ AM_LDFLAGS = -lm
 AM_CPPFLAGS =                                          \
        $(CPPFLAGS_COMMON)                              \
        $(LIBCHAMPLAIN_CFLAGS)                          \
-       $(WEBKIT_CFLAGS)                                \
        $(NULL)
 
 LDADD =                                                                \
@@ -27,7 +26,7 @@ LDADD =                                                               \
        $(EMPATHY_LIBS)                                         \
        $(YELL_LIBS)                                            \
        $(LIBCHAMPLAIN_LIBS)                                    \
-       $(WEBKIT_LIBS)
+       $(NULL)
 
 noinst_LTLIBRARIES = libempathy-accounts-common.la
 
@@ -47,7 +46,6 @@ libempathy_accounts_common_la_LIBADD =                                        \
        $(EDS_LIBS)                                                     \
         $(EMPATHY_LIBS)                                                        \
         $(LIBCHAMPLAIN_LIBS)                                           \
-        $(WEBKIT_LIBS)                                                 \
        $(NULL)
 
 if HAVE_CONTROL_CENTER_EMBEDDING
@@ -159,6 +157,8 @@ empathy_call_SOURCES = \
        empathy-call-window.h \
        empathy-call-window-fullscreen.c \
        empathy-call-window-fullscreen.h \
+       empathy-about-dialog.c \
+       empathy-about-dialog.h \
        empathy-audio-sink.c \
        empathy-audio-sink.h \
        empathy-audio-src.c \
@@ -167,10 +167,16 @@ empathy_call_SOURCES = \
        empathy-video-src.h \
        empathy-video-widget.c \
        empathy-video-widget.h \
+       empathy-preferences.c \
+       empathy-preferences.h \
        ev-sidebar.c \
        ev-sidebar.h \
+       empathy-camera-menu.c \
+       empathy-camera-menu.h \
        empathy-mic-menu.c \
-       empathy-mic-menu.h
+       empathy-mic-menu.h \
+       empathy-rounded-actor.c \
+       empathy-rounded-actor.h
 
 nodist_empathy_call_SOURCES = $(BUILT_SOURCES)
 
@@ -208,7 +214,6 @@ empathy_LDADD =                                                             \
         $(top_builddir)/extensions/libemp-extensions.la                        \
         $(EMPATHY_LIBS)                                                        \
         $(LIBCHAMPLAIN_LIBS)                                           \
-        $(WEBKIT_LIBS)                                                 \
        $(NULL)
 
 nodist_empathy_SOURCES = $(BUILT_SOURCES)