* Changes in the autotools stuff affecting a lot of platform dependent

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

diff --git a/src/maemo/easysetup/Makefile.am b/src/maemo/easysetup/Makefile.am
index deff0b3..b921c7c 100644 (file)
--- a/src/maemo/easysetup/Makefile.am
+++ b/src/maemo/easysetup/Makefile.am
@@ -27,11 +27,12 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # 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) \
+       $(MODEST_HILDON_HELP_CFLAGS) \
+       $(MODEST_HILDON_NOTIFY_CFLAGS)\
        -I ${top_srcdir}/src/widgets  \
        -I ${top_srcdir}/src  \
        -DPREFIX=\"@prefix@\" \
@@ -46,24 +47,29 @@ 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 \
-       modest-easysetup-serversecurity-combo-box.h modest-easysetup-serversecurity-combo-box.c \
-       modest-easysetup-secureauth-combo-box.h modest-easysetup-secureauth-combo-box.c \
-       modest-validating-entry.h modest-validating-entry.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 provided by other packages later
-PROVIDER_DATA_FILE=provider-data.keyfile mcc_mapping
+# mcc_mapping may be provided by the operator-wizard-settings package:
+# the one here is a copy, as that package is not available in chinook
+MMC_MAPPING_FILE=mcc_mapping
+mmccmappingdir=$(datadir)/modest/provider-data
+mmccmapping_DATA = $(MMC_MAPPING_FILE)
+
+PROVIDER_DATA_FILE=maemo-provider-data.keyfile
 providerdatadir=$(datadir)/modest/provider-data
 providerdata_DATA = $(PROVIDER_DATA_FILE)
 
 EXTRA_DIST=\
+       $(MMC_MAPPING_FILE)    \
        $(PROVIDER_DATA_FILE)