2007-07-05 Johannes Schmid <johannes.schmid@openismus.com>

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

diff --git a/src/maemo/easysetup/Makefile.am b/src/maemo/easysetup/Makefile.am
index 56b9044..2ee68a9 100644 (file)
--- a/src/maemo/easysetup/Makefile.am
+++ b/src/maemo/easysetup/Makefile.am
@@ -26,17 +26,21 @@
 # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 # 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_HILDON_WIDGETS_CFLAGS) \
+       $(MODEST_HILDON_HELP_CFLAGS) \
+       $(MODEST_HILDON_NOTIFY_CFLAGS)\
        -I ${top_srcdir}/src/widgets  \
        -I ${top_srcdir}/src  \
        -DPREFIX=\"@prefix@\" \
        -DMAEMO_CHANGES \
        -DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
        -DMODEST_UIDIR=\""$(datadir)/modest/ui/"\" \
+       -DHACK_TOP_SRCDIR=\"${top_srcdir}/\"  \
+       -DPROVIDER_DATA_DIR=\""${datadir}/modest/provider-data/"\" \
        -Wall
 
 noinst_LTLIBRARIES=\
@@ -48,11 +52,19 @@ libmodest_easysetup_la_SOURCES=              \
        modest-easysetup-wizard.h modest-easysetup-wizard.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_HILDON_WIDGETS_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)