Moved calendar widget dependencies from hildon2/ to widgets/

diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am
index b973121..86c39be 100644 (file)
--- a/src/hildon2/Makefile.am
+++ b/src/hildon2/Makefile.am
@@ -39,7 +39,6 @@ INCLUDES=\
        $(MODEST_HILDON_MIME_CFLAGS)        \
        $(MODEST_HILDON_NOTIFY_CFLAGS)      \
        $(MODEST_LIBALARM_CFLAGS)           \
-       $(MODEST_CALENDAR_WIDGETS_CFLAGS)   \
        -I ${top_srcdir}/src/widgets        \
        -I ${top_srcdir}/src                \
        -DPREFIX=\"@prefix@\"               \
@@ -99,8 +98,7 @@ libmodest_ui_la_LIBADD = \
        $(MODEST_HILDON_HELP_LIBS) \
        $(MODEST_LIBALARM_LIBS)   \
        $(MODEST_LIBIPHB_LIBS)   \
-       $(MODEST_HILDON_NOTIFY_LIBS) \
-       $(MODEST_CALENDAR_WIDGETS_LIBS)
+       $(MODEST_HILDON_NOTIFY_LIBS)
 
 UI_FILES=\
        ui/modest-main-window-ui.xml \

diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am
index 5960485..4a7a74b 100644 (file)
--- a/src/widgets/Makefile.am
+++ b/src/widgets/Makefile.am
@@ -12,6 +12,7 @@ INCLUDES=\
        $(MODEST_WPEDITOR_CFLAGS)           \
        $(MODEST_LIBCONIC_CFLAGS)           \
        $(MODEST_HILDON_NOTIFY_CFLAGS) \
+       $(MODEST_CALENDAR_WIDGETS_CFLAGS)   \
        -I ${top_srcdir}/src/$(MODEST_TOOLKIT_DIR) \
        -I ${top_srcdir}/src \
        -DPREFIX=\"@prefix@\" \
@@ -167,9 +168,11 @@ libmodest_widgets_la_includedir = $(includedir)/modest-plugin-1.0/widgets/
 libmodest_widgets_la_include_HEADERS = $(libmodest_widgets_public_headers)
 
 LDADD = \
-       $(MODEST_GSTUFF_LIBS)                           \
-       $(MODEST_MOZEMBED_LIBS)                         \
-       $(MODEST_WPEDITOR_LIBS) \
-       $(MODEST_PLATFORM_LIBS)                         \
-       $(MODEST_LIBCONIC_LIBS) \
-       $(MODEST_TOOLKIT_LIBS) 
+       $(MODEST_GSTUFF_LIBS)           \
+       $(MODEST_MOZEMBED_LIBS)         \
+       $(MODEST_WPEDITOR_LIBS)         \
+       $(MODEST_PLATFORM_LIBS)         \
+       $(MODEST_LIBCONIC_LIBS)         \
+       $(MODEST_TOOLKIT_LIBS)          \
+       $(MODEST_CALENDAR_WIDGETS_LIBS)
+