X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=src%2FMakefile.am;h=42485b7d1fed7105ee9f131effd608787523db09;hp=f24ef3e95aa6873f2c60a4d8704b2d8939ffb0cb;hb=2f64117b60d24ba5ad3f4bb1c41d4ea3a91f15a6;hpb=658bb59ac654bc4bbe95ae1aec17eec2fe9bb499

diff --git a/src/Makefile.am b/src/Makefile.am
index f24ef3e9..42485b7d 100644
--- 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			\
@@ -22,13 +28,14 @@ BUILT_SOURCES= \
 	empathy-tube-dispatch-enumtypes.h \
 	empathy-tube-dispatch-enumtypes.c
 
-empathy_SOURCES =							\
-	bacon-message-connection.c bacon-message-connection.h		\
+empathy_handwritten_source = \
 	empathy.c							\
 	empathy-about-dialog.c empathy-about-dialog.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-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			\
@@ -40,17 +47,28 @@ empathy_SOURCES =							\
 	empathy-preferences.c empathy-preferences.h			\
 	empathy-sidebar.c empathy-sidebar.h			\
 	empathy-status-icon.c empathy-status-icon.h			\
-	empathy-tube-dispatch.c empathy-tube-dispatch.h			\
+	empathy-tube-dispatch.c empathy-tube-dispatch.h
+
+empathy_SOURCES =							\
+	$(empathy_handwritten_source)					\
+	bacon-message-connection.c bacon-message-connection.h		\
 	ephy-spinner.c ephy-spinner.h
 
 nodist_empathy_SOURCES = $(BUILT_SOURCES)
 
 empathy_logs_SOURCES = empathy-logs.c
 
+check_c_sources = \
+    $(empathy_handwritten_source) \
+    $(empathy_logs_SOURCES)
+include $(top_srcdir)/tools/check-coding-style.mk
+check-local: check-coding-style
+
 uidir = $(datadir)/empathy
 ui_DATA = 					\
 	empathy-accounts-dialog.ui		\
 	empathy-call-window.ui			\
+	empathy-call-window-fullscreen.ui			\
 	empathy-chatrooms-window.ui		\
 	empathy-chat-window.ui			\
 	empathy-ft-manager.ui			\
@@ -60,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
 
@@ -81,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)