X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=libempathy-gtk%2FMakefile.am;h=33dcbfb9332d954d27c72b2bb326fa4bc4d03778;hp=def25e357490b847c2df82b8ec7d89ed7af6a18a;hb=2021c145e0c5eb6aa9eda91d58d54b13007113ad;hpb=1c7e66a2a609bf5e956c6f76bf7db7e585860731

diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am
index def25e35..33dcbfb9 100644
--- a/libempathy-gtk/Makefile.am
+++ b/libempathy-gtk/Makefile.am
@@ -8,15 +8,13 @@ AM_CPPFLAGS =                                           \
 	-DPKGDATADIR=\""$(pkgdatadir)"\"		\
 	-DGCR_API_SUBJECT_TO_CHANGE			\
 	$(EMPATHY_CFLAGS)				\
-	$(GTK_CFLAGS)				\
-	$(LIBNOTIFY_CFLAGS)				\
-	$(CANBERRA_CFLAGS) \
+	$(YELL_CFLAGS)					\
 	$(ENCHANT_CFLAGS)				\
 	$(LIBCHAMPLAIN_CFLAGS)				\
 	$(GEOCLUE_CFLAGS)				\
-	$(GCR_CFLAGS)					\
-	$(MEEGO_CFLAGS)				\
-	$(WEBKIT_CFLAGS)				\
+	$(GEOCODE_CFLAGS)				\
+	$(MEEGO_CFLAGS)					\
+	$(CHEESE_CFLAGS)				\
 	$(WARN_CFLAGS)					\
 	$(DISABLE_DEPRECATED)
 
@@ -35,22 +33,24 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-account-widget-private.h	\
 	empathy-account-widget-sip.c		\
 	empathy-account-widget.c		\
-	empathy-audio-sink.c			\
-	empathy-audio-src.c			\
 	empathy-avatar-chooser.c		\
 	empathy-avatar-image.c			\
+	empathy-call-utils.c			\
 	empathy-cell-renderer-activatable.c	\
 	empathy-cell-renderer-expander.c	\
 	empathy-cell-renderer-text.c		\
 	empathy-chat-text-view.c		\
 	empathy-chat-view.c			\
 	empathy-chat.c				\
+	empathy-contact-blocking-dialog.c	\
 	empathy-contact-dialogs.c		\
+	empathy-contact-chooser.c		\
 	empathy-contact-list-store.c		\
 	empathy-contact-list-view.c		\
 	empathy-contact-menu.c			\
 	empathy-linking-dialog.c		\
 	empathy-live-search.c			\
+	empathy-contact-search-dialog.c		\
 	empathy-contact-selector.c		\
 	empathy-contact-selector-dialog.c \
 	empathy-contact-widget.c		\
@@ -72,6 +72,7 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-new-message-dialog.c		\
 	empathy-new-call-dialog.c		\
 	empathy-notify-manager.c		\
+	empathy-password-dialog.c 		\
 	empathy-persona-store.c			\
 	empathy-persona-view.c			\
 	empathy-presence-chooser.c		\
@@ -79,7 +80,7 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-search-bar.c			\
 	empathy-share-my-desktop.c		\
 	empathy-smiley-manager.c		\
-	empathy-sound.c				\
+	empathy-sound-manager.c			\
 	empathy-spell.c				\
 	empathy-status-preset-dialog.c		\
 	empathy-string-parser.c			\
@@ -88,30 +89,34 @@ libempathy_gtk_handwritten_source =            	\
 	empathy-theme-manager.c			\
 	empathy-tls-dialog.c			\
 	empathy-ui-utils.c			\
-	empathy-video-src.c			\
-	empathy-video-widget.c
+	empathy-plist.c				\
+	empathy-theme-adium.c			\
+	empathy-webkit-utils.c			\
+	$(NULL)
 
 libempathy_gtk_headers =			\
 	empathy-account-chooser.h		\
 	empathy-account-widget-irc.h		\
 	empathy-account-widget-sip.h		\
 	empathy-account-widget.h		\
-	empathy-audio-sink.h			\
-	empathy-audio-src.h			\
 	empathy-avatar-chooser.h		\
 	empathy-avatar-image.h			\
+	empathy-call-utils.h			\
 	empathy-cell-renderer-activatable.h	\
 	empathy-cell-renderer-expander.h	\
 	empathy-cell-renderer-text.h		\
 	empathy-chat-text-view.h		\
 	empathy-chat-view.h			\
 	empathy-chat.h				\
+	empathy-contact-blocking-dialog.h	\
 	empathy-contact-dialogs.h		\
+	empathy-contact-chooser.h		\
 	empathy-contact-list-store.h		\
 	empathy-contact-list-view.h		\
 	empathy-contact-menu.h			\
 	empathy-linking-dialog.h		\
 	empathy-live-search.h			\
+	empathy-contact-search-dialog.h		\
 	empathy-contact-selector.h		\
 	empathy-contact-selector-dialog.h \
 	empathy-contact-widget.h		\
@@ -134,6 +139,7 @@ libempathy_gtk_headers =			\
 	empathy-new-message-dialog.h		\
 	empathy-new-call-dialog.h		\
 	empathy-notify-manager.h		\
+	empathy-password-dialog.h		\
 	empathy-persona-store.h			\
 	empathy-persona-view.h			\
 	empathy-presence-chooser.h		\
@@ -141,7 +147,7 @@ libempathy_gtk_headers =			\
 	empathy-search-bar.h			\
 	empathy-share-my-desktop.h		\
 	empathy-smiley-manager.h		\
-	empathy-sound.h				\
+	empathy-sound-manager.h			\
 	empathy-spell.h				\
 	empathy-status-preset-dialog.h		\
 	empathy-string-parser.h			\
@@ -150,13 +156,15 @@ libempathy_gtk_headers =			\
 	empathy-theme-manager.h			\
 	empathy-tls-dialog.h			\
 	empathy-ui-utils.h			\
-	empathy-video-src.h			\
-	empathy-video-widget.h
+	empathy-plist.h				\
+	empathy-theme-adium.h			\
+	empathy-webkit-utils.h			\
+	$(NULL)
+
 
 libempathy_gtk_la_SOURCES =			\
 	$(libempathy_gtk_handwritten_source)	\
 	$(libempathy_gtk_headers)		\
-	gcr-simple-certificate.c gcr-simple-certificate.h \
 	totem-subtitle-encoding.c totem-subtitle-encoding.h
 
 # do not distribute generated files
@@ -164,6 +172,7 @@ nodist_libempathy_gtk_la_SOURCES =\
 	$(BUILT_SOURCES)
 
 libempathy_gtk_la_LIBADD =			\
+	$(EMPATHY_LIBS)			\
 	$(EMPATHY_LIBS)			\
 	$(GTK_LIBS)			\
 	$(LIBNOTIFY_LIBS)			\
@@ -171,9 +180,10 @@ libempathy_gtk_la_LIBADD =			\
 	$(ENCHANT_LIBS)				\
 	$(LIBCHAMPLAIN_LIBS)			\
 	$(GEOCLUE_LIBS)				\
+	$(GEOCODE_LIBS)				\
 	$(GCR_LIBS)				\
 	$(MEEGO_LIBS)				\
-	$(WEBKIT_LIBS)				\
+	$(CHEESE_LIBS)				\
 	$(top_builddir)/libempathy/libempathy.la
 
 check_c_sources = \
@@ -186,6 +196,7 @@ uidir = $(datadir)/empathy
 ui_DATA = 					\
 	empathy-contact-widget.ui		\
 	empathy-contact-dialogs.ui		\
+	empathy-contact-blocking-dialog.ui	\
 	empathy-account-widget-generic.ui	\
 	empathy-account-widget-jabber.ui	\
 	empathy-account-widget-msn.ui		\
@@ -274,21 +285,6 @@ EXTRA_DIST +=					\
 	empathy-location-manager.h
 endif
 
-if HAVE_WEBKIT
-libempathy_gtk_handwritten_source +=		\
-	empathy-plist.c				\
-	empathy-theme-adium.c
-libempathy_gtk_headers +=			\
-	empathy-plist.h				\
-	empathy-theme-adium.h
-else
-EXTRA_DIST +=					\
-	empathy-plist.c				\
-	empathy-plist.h				\
-	empathy-theme-adium.c			\
-	empathy-theme-adium.h
-endif
-
 CLEANFILES =				\
 	$(BUILT_SOURCES)		\
 	stamp-empathy-gtk-enum-types.h