diff options
Diffstat (limited to 'modules/backup-restore')
-rw-r--r-- | modules/backup-restore/Makefile.am | 10 | ||||
-rw-r--r-- | modules/backup-restore/e-mail-config-restore-page.c | 4 | ||||
-rw-r--r-- | modules/backup-restore/evolution-backup-restore.c | 6 |
3 files changed, 10 insertions, 10 deletions
diff --git a/modules/backup-restore/Makefile.am b/modules/backup-restore/Makefile.am index 7d952e795e..4b5970764c 100644 --- a/modules/backup-restore/Makefile.am +++ b/modules/backup-restore/Makefile.am @@ -5,7 +5,6 @@ module_LTLIBRARIES = module-backup-restore.la module_backup_restore_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DG_LOG_DOMAIN=\"evolution-backup-restore\" \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ @@ -15,6 +14,7 @@ module_backup_restore_la_CPPFLAGS = \ -DLIBDIR=\""$(libdir)"\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ $(GTKHTML_CFLAGS) \ $(NULL) @@ -30,11 +30,10 @@ module_backup_restore_la_LIBADD = \ $(top_builddir)/e-util/libeutil.la \ $(top_builddir)/shell/libeshell.la \ $(top_builddir)/mail/libevolution-mail.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/libemail-engine/libemail-engine.la \ - $(top_builddir)/libevolution-utils/libevolution-utils.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ $(GTKHTML_LIBS) \ $(NULL) @@ -46,7 +45,6 @@ privlibexec_PROGRAMS = evolution-backup evolution_backup_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -DEVOLUTION_LOCALEDIR=\""$(localedir)"\" \ -DEVOLUTION_TOOLSDIR=\""$(privlibexecdir)"\" \ -DPREFIX=\""$(prefix)"\" \ @@ -56,6 +54,8 @@ evolution_backup_CPPFLAGS = \ -DDBUS_SERVICES_DIR=\"'${datadir}'/dbus-1/services\" \ $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) \ + $(CHAMPLAIN_CFLAGS) \ + $(GTKHTML_CFLAGS) \ $(NULL) evolution_backup_SOURCES = \ @@ -66,6 +66,8 @@ evolution_backup_LDADD = \ $(top_builddir)/e-util/libeutil.la \ $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ + $(CHAMPLAIN_LIBS) \ + $(GTKHTML_LIBS) \ $(NULL) if OS_WIN32 diff --git a/modules/backup-restore/e-mail-config-restore-page.c b/modules/backup-restore/e-mail-config-restore-page.c index 7a997661e3..33b192c87a 100644 --- a/modules/backup-restore/e-mail-config-restore-page.c +++ b/modules/backup-restore/e-mail-config-restore-page.c @@ -27,9 +27,7 @@ #endif #include <glib/gi18n-lib.h> -#include <libevolution-utils/e-alert-sink.h> -#include <libevolution-utils/e-alert-dialog.h> -#include <misc/e-alert-bar.h> +#include <e-util/e-util.h> #define E_MAIL_CONFIG_RESTORE_PAGE_GET_PRIVATE(obj) \ (G_TYPE_INSTANCE_GET_PRIVATE \ diff --git a/modules/backup-restore/evolution-backup-restore.c b/modules/backup-restore/evolution-backup-restore.c index 925315b8af..01028e53f7 100644 --- a/modules/backup-restore/evolution-backup-restore.c +++ b/modules/backup-restore/evolution-backup-restore.c @@ -30,13 +30,13 @@ #include <libebackend/libebackend.h> -#include <mail/e-mail-config-assistant.h> -#include <libevolution-utils/e-alert-dialog.h> #include <e-util/e-util.h> -#include <e-util/e-dialog-utils.h> + #include <shell/e-shell-utils.h> #include <shell/e-shell-window.h> +#include <mail/e-mail-config-assistant.h> + #include "e-mail-config-restore-page.h" #include "e-mail-config-restore-ready-page.h" |