diff options
| author | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-05 19:57:30 +0800 |
|---|---|---|
| committer | Rodrigo Moya <rodrigo@gnome-db.org> | 2011-10-05 19:57:30 +0800 |
| commit | 4ec46cc05fcb94d181fb9c2412984a1446647c85 (patch) | |
| tree | d16ce30e77dd539c03509237dd4c723d46aea97a /modules/windows-sens | |
| parent | 5ea7e23aef0c239af2600c95419ba0bda0f08b3c (diff) | |
| parent | 19163c2b71e6128fc9b32287b99b1f4422324c2d (diff) | |
| download | gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.gz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.bz2 gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.lz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.xz gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.tar.zst gsoc2013-evolution-4ec46cc05fcb94d181fb9c2412984a1446647c85.zip | |
Merge from master
Diffstat (limited to 'modules/windows-sens')
| -rw-r--r-- | modules/windows-sens/Makefile.am | 8 | ||||
| -rw-r--r-- | modules/windows-sens/evolution-windows-sens.c | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/modules/windows-sens/Makefile.am b/modules/windows-sens/Makefile.am index 5036642d09..a9b9d31865 100644 --- a/modules/windows-sens/Makefile.am +++ b/modules/windows-sens/Makefile.am @@ -1,20 +1,22 @@ module_LTLIBRARIES = libevolution-module-windows-sens.la -libevolution_module_windows_sens_la_CPPFLAGS = \ +libevolution_module_windows_sens_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ -I$(top_srcdir) \ -DG_LOG_DOMAIN=\"evolution-windows-sens\" \ + $(EVOLUTION_DATA_SERVER_CFLAGS) \ $(GNOME_PLATFORM_CFLAGS) -libevolution_module_windows_sens_la_SOURCES = \ +libevolution_module_windows_sens_la_SOURCES = \ evolution-windows-sens.c libevolution_module_windows_sens_la_LIBADD = \ $(top_builddir)/shell/libeshell.la \ + $(EVOLUTION_DATA_SERVER_LIBS) \ $(GNOME_PLATFORM_LIBS) \ $(SENS_LIBS) -libevolution_module_windows_sens_la_LDFLAGS = \ +libevolution_module_windows_sens_la_LDFLAGS = \ -module -avoid-version $(NO_UNDEFINED) -include $(top_srcdir)/git.mk diff --git a/modules/windows-sens/evolution-windows-sens.c b/modules/windows-sens/evolution-windows-sens.c index d2154590b1..f3110b2fcc 100644 --- a/modules/windows-sens/evolution-windows-sens.c +++ b/modules/windows-sens/evolution-windows-sens.c @@ -32,6 +32,8 @@ #include <eventsys.h> #else +#include <libebackend/e-extension.h> + /* Extract relevant typedefs from mingw-w64 headers */ typedef struct IEnumEventObject IEnumEventObject; @@ -195,7 +197,6 @@ struct ISensNetwork { #endif #include <shell/e-shell.h> -#include <e-util/e-extension.h> /* 4E14FB9F-2E22-11D1-9964-00C04FBBB345 */ DEFINE_GUID (IID_IEventSystem, 0x4E14FB9F, 0x2E22, 0x11D1, 0x99, 0x64, 0x00, 0xC0, 0x4F, 0xBB, 0xB3, 0x45); |