X-Git-Url: https://git.0d.be/?p=empathy.git;a=blobdiff_plain;f=libempathy-gtk%2FMakefile.am;h=33dcbfb9332d954d27c72b2bb326fa4bc4d03778;hp=c8a4cbb6a0d14c2825cc297e1af0f2842cfc1e5c;hb=2021c145e0c5eb6aa9eda91d58d54b13007113ad;hpb=96569c764125b9c80909c7cece9e37b65eb632ca diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index c8a4cbb6..33dcbfb9 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -6,14 +6,15 @@ AM_CPPFLAGS = \ -I$(top_srcdir) \ -DDATADIR=\""$(datadir)"\" \ -DPKGDATADIR=\""$(pkgdatadir)"\" \ - $(LIBEMPATHYGTK_CFLAGS) \ - $(TPL_CFLAGS) \ - $(LIBNOTIFY_CFLAGS) \ + -DGCR_API_SUBJECT_TO_CHANGE \ + $(EMPATHY_CFLAGS) \ + $(YELL_CFLAGS) \ $(ENCHANT_CFLAGS) \ $(LIBCHAMPLAIN_CFLAGS) \ $(GEOCLUE_CFLAGS) \ - $(MEEGO_CFLAGS) \ - $(WEBKIT_CFLAGS) \ + $(GEOCODE_CFLAGS) \ + $(MEEGO_CFLAGS) \ + $(CHEESE_CFLAGS) \ $(WARN_CFLAGS) \ $(DISABLE_DEPRECATED) @@ -32,93 +33,134 @@ 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 \ empathy-geometry.c \ + empathy-groups-widget.c \ + empathy-individual-dialogs.c \ + empathy-individual-edit-dialog.c \ + empathy-individual-information-dialog.c \ + empathy-individual-linker.c \ + empathy-individual-menu.c \ + empathy-individual-store.c \ + empathy-individual-view.c \ + empathy-individual-widget.c \ + empathy-input-text-view.c \ + empathy-irc-network-chooser.c \ + empathy-irc-network-chooser-dialog.c \ empathy-irc-network-dialog.c \ - empathy-kludge-label.c \ empathy-log-window.c \ 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 \ empathy-protocol-chooser.c \ 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 \ empathy-theme-boxes.c \ empathy-theme-irc.c \ 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 \ empathy-geometry.h \ + empathy-groups-widget.h \ empathy-images.h \ + empathy-individual-dialogs.h \ + empathy-individual-edit-dialog.h \ + empathy-individual-information-dialog.h \ + empathy-individual-linker.h \ + empathy-individual-menu.h \ + empathy-individual-store.h \ + empathy-individual-view.h \ + empathy-individual-widget.h \ + empathy-input-text-view.h \ + empathy-irc-network-chooser.h \ + empathy-irc-network-chooser-dialog.h \ empathy-irc-network-dialog.h \ - empathy-kludge-label.h \ empathy-log-window.h \ 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 \ empathy-protocol-chooser.h \ 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 \ empathy-theme-boxes.h \ empathy-theme-irc.h \ 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) \ @@ -130,14 +172,18 @@ nodist_libempathy_gtk_la_SOURCES =\ $(BUILT_SOURCES) libempathy_gtk_la_LIBADD = \ - $(LIBEMPATHYGTK_LIBS) \ + $(EMPATHY_LIBS) \ + $(EMPATHY_LIBS) \ + $(GTK_LIBS) \ $(LIBNOTIFY_LIBS) \ - $(TPL_LIBS) \ + $(CANBERRA_LIBS) \ $(ENCHANT_LIBS) \ $(LIBCHAMPLAIN_LIBS) \ $(GEOCLUE_LIBS) \ + $(GEOCODE_LIBS) \ + $(GCR_LIBS) \ $(MEEGO_LIBS) \ - $(WEBKIT_LIBS) \ + $(CHEESE_LIBS) \ $(top_builddir)/libempathy/libempathy.la check_c_sources = \ @@ -150,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 \ @@ -164,7 +211,8 @@ ui_DATA = \ empathy-log-window.ui \ empathy-chat.ui \ empathy-contact-selector-dialog.ui \ - empathy-search-bar.ui + empathy-search-bar.ui \ + empathy-individual-widget.ui empathy-gtk-marshal.list: $(libempathy_gtk_la_SOURCES) Makefile.am $(AM_V_GEN)( cd $(srcdir) && \ @@ -237,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