Revert "Fixes NB#123383, unexpected lines appear in new email editor body area"

[modest] / src / maemo / easysetup / Makefile.am

diff --git a/src/maemo/easysetup/Makefile.am b/src/maemo/easysetup/Makefile.am
index 2076f94..daa9ca5 100644 (file)
--- a/src/maemo/easysetup/Makefile.am
+++ b/src/maemo/easysetup/Makefile.am
@@ -29,8 +29,11 @@
 # HACK_TOP_SRCDIR is temporary and should be remove.
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS) \
-       $(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
-       -DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID) \
+       $(MODEST_PLATFORM_CFLAGS) \
+       $(MODEST_TOOLKIT_CFLAGS) \
+       $(MODETS_PLUGIN_DEFINES) \
+       $(MODEST_HILDON_HELP_CFLAGS) \
+       $(MODEST_HILDON_NOTIFY_CFLAGS)\
        -I ${top_srcdir}/src/widgets  \
        -I ${top_srcdir}/src  \
        -DPREFIX=\"@prefix@\" \
@@ -45,21 +48,15 @@ noinst_LTLIBRARIES=\
        libmodest-easysetup.la
 
 libmodest_easysetup_la_SOURCES=              \
-       modest-wizard-dialog.h modest-wizard-dialog.c \
-       modest-presets.h modest-presets.c \
-       modest-easysetup-wizard.h modest-easysetup-wizard.c \
+       modest-easysetup-wizard-dialog.h modest-easysetup-wizard-dialog.c \
        modest-easysetup-country-combo-box.h modest-easysetup-country-combo-box.c \
        modest-easysetup-provider-combo-box.h modest-easysetup-provider-combo-box.c \
        modest-easysetup-servertype-combo-box.h modest-easysetup-servertype-combo-box.c
 
 LDADD = \
+       $(MODEST_HILDON_HELP_LIBS) \
+       $(MODEST_HILDON_NOTIFY_LIBS)\
+       $(MODEST_TOOLKIT_LIBS) \
        $(MODEST_GSTUFF_LIBS) \
-       $(MODEST_LIBTINYMAIL_MAEMO_LIBS)
+       $(MODEST_PLATFORM_LIBS)
 
-# mcc_mapping will in future be provided by the operator-wizard-settings package:
-MMC_MAPPING_FILE=mcc_mapping
-mmccmappingdir=$(datadir)/modest/provider-data
-mmccmapping_DATA = $(MMC_MAPPING_FILE)
-
-EXTRA_DIST=\
-       $(MMC_MAPPING_FILE)