Merge branch 'debug-window'

[empathy.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 8973d533f28ee21dc39d46fdc3e83f85440f9db7..980f0029e9f7671eb24ff784614af75793f2203b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,11 +1,14 @@
 include $(top_srcdir)/tools/shave.mk
+include $(top_srcdir)/tools/flymake.mk
 
 AM_CPPFLAGS =                                          \
        -I$(top_srcdir)                                 \
+       -DG_LOG_DOMAIN=\"empathy\"                      \
        $(EMPATHY_CFLAGS)                               \
        $(LIBNOTIFY_CFLAGS)                             \
        $(LIBCHAMPLAIN_CFLAGS)                          \
-       $(DISABLE_DEPRECATED)
+       $(DISABLE_DEPRECATED)                           \
+       $(WEBKIT_CFLAGS)                                \
        $(WARN_CFLAGS)
 
 LDADD =                                                                \
@@ -14,7 +17,8 @@ LDADD =                                                               \
        $(top_builddir)/extensions/libemp-extensions.la         \
        $(LIBNOTIFY_LIBS)                                       \
        $(EMPATHY_LIBS)                                         \
-       $(LIBCHAMPLAIN_LIBS)
+       $(LIBCHAMPLAIN_LIBS)                                    \
+       $(WEBKIT_LIBS)
 
 bin_PROGRAMS =                 \
        empathy                 \
@@ -27,15 +31,20 @@ BUILT_SOURCES= \
 empathy_handwritten_source = \
        empathy.c                                                       \
        empathy-about-dialog.c empathy-about-dialog.h                   \
+       empathy-account-assistant.c empathy-account-assistant.h         \
        empathy-accounts-dialog.c empathy-accounts-dialog.h             \
        empathy-call-window.c empathy-call-window.h                     \
        empathy-call-window-fullscreen.c empathy-call-window-fullscreen.h                       \
        empathy-chatrooms-window.c empathy-chatrooms-window.h           \
+       empathy-debug-window.c empathy-debug-window.h                   \
        empathy-chat-window.c empathy-chat-window.h                     \
        empathy-event-manager.c empathy-event-manager.h                 \
+       empathy-import-mc4-accounts.c empathy-import-mc4-accounts.h     \
        empathy-ft-manager.c empathy-ft-manager.h                       \
        empathy-import-dialog.c empathy-import-dialog.h                 \
+       empathy-import-widget.c empathy-import-widget.h                 \
        empathy-import-pidgin.c empathy-import-pidgin.h                 \
+       empathy-import-utils.c empathy-import-utils.h                   \
        empathy-main-window.c empathy-main-window.h                     \
        empathy-misc.c empathy-misc.h                                   \
        empathy-new-chatroom-dialog.c empathy-new-chatroom-dialog.h     \
@@ -46,7 +55,6 @@ empathy_handwritten_source = \
 
 empathy_SOURCES =                                                      \
        $(empathy_handwritten_source)                                   \
-       bacon-message-connection.c bacon-message-connection.h           \
        ephy-spinner.c ephy-spinner.h
 
 nodist_empathy_SOURCES = $(BUILT_SOURCES)
@@ -73,12 +81,22 @@ ui_DATA =                                   \
        empathy-preferences.ui                  \
        empathy-status-icon.ui
 
+EXTRA_DIST =                   \
+       $(autostart_DATA)       \
+       $(ui_DATA)
+
 if HAVE_LIBCHAMPLAIN
-empathy_SOURCES +=                             \
-       empathy-map-view.c empathy-map-view.h
+empathy_handwritten_source +=                          \
+       empathy-map-view.c                      \
+       empathy-map-view.h
 
 ui_DATA +=                                     \
        empathy-map-view.ui
+else
+EXTRA_DIST +=                                  \
+       empathy-map-view.c                      \
+       empathy-map-view.h                      \
+       empathy-map-view.ui
 endif
 
 dist_man_MANS =                        \
@@ -102,9 +120,5 @@ dist_man_MANS =                     \
        --vtail "      { 0, NULL, NULL }\n    };\n    etype = g_@type@_register_static (\"@EnumName@\", values);\n  }\n  return etype;\n}\n" \
        $< > $@
 
-EXTRA_DIST =                   \
-       $(autostart_DATA)       \
-       $(ui_DATA)
-
 CLEANFILES = $(BUILT_SOURCES)