Merge branch 'debugger'

[empathy.git] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 58f30ad7d5b6263e5d664f21a184b997f5febf17..42485b7d1fed7105ee9f131effd608787523db09 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,18 +1,24 @@
 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)                             \
-       $(WARN_CFLAGS)                                  \
-       $(DISABLE_DEPRECATED)
+       $(LIBCHAMPLAIN_CFLAGS)                          \
+       $(DISABLE_DEPRECATED)                           \
+       $(WEBKIT_CFLAGS)                                \
+       $(WARN_CFLAGS)
 
 LDADD =                                                                \
        $(top_builddir)/libempathy-gtk/libempathy-gtk.la        \
        $(top_builddir)/libempathy/libempathy.la                \
        $(top_builddir)/extensions/libemp-extensions.la         \
        $(LIBNOTIFY_LIBS)                                       \
-       $(EMPATHY_LIBS)
+       $(EMPATHY_LIBS)                                         \
+       $(LIBCHAMPLAIN_LIBS)                                    \
+       $(WEBKIT_LIBS)
 
 bin_PROGRAMS =                 \
        empathy                 \
@@ -29,6 +35,7 @@ empathy_handwritten_source = \
        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-dialog.c empathy-debug-dialog.h                   \
        empathy-chat-window.c empathy-chat-window.h                     \
        empathy-event-manager.c empathy-event-manager.h                 \
        empathy-ft-manager.c empathy-ft-manager.h                       \
@@ -71,6 +78,24 @@ ui_DATA =                                    \
        empathy-preferences.ui                  \
        empathy-status-icon.ui
 
+EXTRA_DIST =                   \
+       $(autostart_DATA)       \
+       $(ui_DATA)
+
+if HAVE_LIBCHAMPLAIN
+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 =                        \
        empathy.1
 
@@ -92,9 +117,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)