X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2FMakefile.am;h=892430f8130d4ee64af8a34cf49241262dda4988;hb=69a11d0de474393ee14e21123956e611625c17ab;hp=d6424b47a3acd7223bef09d2c6807b03ed14c4b9;hpb=0cbdc04cec54252672feac919caa15ed525a2591;p=modest

diff --git a/src/hildon2/Makefile.am b/src/hildon2/Makefile.am
index d6424b4..892430f 100644
--- a/src/hildon2/Makefile.am
+++ b/src/hildon2/Makefile.am
@@ -27,10 +27,11 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 INCLUDES=\
+	$(LIBMODEST_DBUS_CLIENT_CFLAGS)     \
 	$(MODEST_GSTUFF_CFLAGS)             \
 	$(MODEST_WPEDITOR_CFLAGS)           \
 	$(MODEST_PLATFORM_CFLAGS)           \
-	$(MODEST_TOOLKIT_CFLAGS)           \
+	$(MODEST_TOOLKIT_CFLAGS)            \
 	$(MODEST_PLUGIN_DEFINES)            \
 	$(MODEST_ABOOK_CFLAGS)              \
 	$(MODEST_HILDON_HELP_CFLAGS)        \
@@ -38,10 +39,10 @@ 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@\" 	            \
-	-DMAEMO_CHANGES                     \
 	-DMODEST_UIDIR=\""$(datadir)/modest/ui/"\" \
 	-Wall
 
@@ -49,45 +50,32 @@ noinst_LTLIBRARIES=\
 	libmodest-ui.la
 
 libmodest_ui_la_SOURCES=              \
-	modest-account-view-window.c  \
-	modest-default-account-settings-dialog.c \
-	modest-easysetup-wizard-dialog.h modest-easysetup-wizard-dialog.c \
 	modest-country-picker.h modest-country-picker.c \
+	modest-color-button.h modest-color-button.c \
 	modest-provider-picker.h modest-provider-picker.c \
 	modest-serversecurity-picker.h modest-serversecurity-picker.c \
 	modest-servertype-picker.h modest-servertype-picker.c \
-	modest-folder-window.c \
-	modest-folder-window.h \
-	modest-header-window.c \
-	modest-header-window.h \
 	modest-icon-names.h           \
 	modest-hildon2-global-settings-dialog.c \
 	modest-hildon2-global-settings-dialog.h \
 	modest-maemo-security-options-view.c \
-	modest-main-window.c          \
-	modest-main-window-ui.h       \
 	modest-hildon-includes.h      \
+	modest-hildon-find-toolbar.h  \
+	modest-hildon-find-toolbar.c  \
+	modest-hildon-pannable-area-scrollable.h	\
+	modest-hildon-pannable-area-scrollable.c	\
 	modest-hildon2-details-dialog.h \
 	modest-hildon2-details-dialog.c \
 	modest-hildon2-sort-dialog.c   \
 	modest-hildon2-sort-dialog.h   \
+	modest-hildon2-window.h \
+	modest-hildon2-window.c \
 	modest-platform.c	      \
-	modest-signature-editor-dialog.c         \
-	modest-signature-editor-dialog.h         \
-	modest-msg-view-window.c      \
-	modest-msg-edit-window.c      \
+	modest-hildon2-msg-view-window.h      \
+	modest-hildon2-msg-view-window.c      \
 	modest-maemo-utils.c          \
-	modest-connection-specific-smtp-window.h \
-	modest-connection-specific-smtp-window.c \
-	modest-connection-specific-smtp-edit-window.h \
-	modest-connection-specific-smtp-edit-window.c \
-	modest-osso-autosave-callbacks.c \
-	modest-osso-autosave-callbacks.h \
-	modest-osso-state-saving.c \
-	modest-osso-state-saving.h   \
-	modest-presets.h modest-presets.c \
-	modest-limit-retrieve-picker.h modest-limit-retrieve-picker.c \
-	modest-retrieve-picker.h modest-retrieve-picker.c \
+	modest-number-editor.c        \
+	modest-number-editor.h        \
 	modest-secureauth-picker.h modest-secureauth-picker.c \
 	modest-selector-picker.h modest-selector-picker.c \
 	modest-hildon2-window-mgr.h modest-hildon2-window-mgr.c
@@ -97,9 +85,15 @@ if MODEST_USE_DUMMY_ADDRESS_BOOK
 #	 nothing 
 else
 libmodest_ui_la_SOURCES += modest-address-book.c
+
+if MODEST_BUILD_ASDBUS
+libmodest_ui_la_SOURCES+= \
+	asdbus.h asdbus.c asdbus-bindings.h
+endif
 endif 
 
 
+
 libmodest_ui_la_LIBADD = \
 	$(MODEST_GSTUFF_LIBS) \
 	$(MODEST_ABOOK_LIBS) \
@@ -110,35 +104,22 @@ libmodest_ui_la_LIBADD = \
 	$(MODEST_LIBCONIC_LIBS) \
 	$(MODEST_HILDON_HELP_LIBS) \
 	$(MODEST_LIBALARM_LIBS)   \
-	$(MODEST_HILDON_NOTIFY_LIBS)
-
-UI_FILES=\
-	ui/modest-main-window-ui.xml \
-	ui/modest-msg-edit-window-ui.xml \
-	ui/modest-msg-view-window-ui.xml
-
-uidir = $(datadir)/modest/ui
-ui_DATA = $(UI_FILES)
+	$(MODEST_LIBIPHB_LIBS)   \
+	$(MODEST_HILDON_NOTIFY_LIBS) \
+	$(MODEST_CALENDAR_WIDGETS_LIBS)
 
 serviceentry_DATA   = com.nokia.modest.service
 desktopentry_DATA   = modest.desktop
 backupsettings_DATA = modest.conf
-
-# 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)
+prebackup_SCRIPTS = modest-prebackup.sh
+restore_SCRIPTS = modest-restore.sh
+ossocudscripts_SCRIPTS = modest-clean.sh
 
 EXTRA_DIST=\
-	$(UI_FILES) \
 	$(PIXMAP_FILES) \
 	$(serviceentry_DATA) \
 	$(desktopentry_DATA) \
 	$(backupsettings_DATA) \
-	$(MMC_MAPPING_FILE)    \
-	$(PROVIDER_DATA_FILE)
+	$(prebackup_SCRIPTS) \
+	$(restore_SCRIPTS) \
+	$(ossocudscripts_SCRIPTS)