* Removed the ModestTnyAttachment stuff

[modest] / src / Makefile.am

diff --git a/src/Makefile.am b/src/Makefile.am
index 766f8b1..1e76d84 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2,17 +2,20 @@
 # Makefile.am
 # Time-stamp: <2006-11-28 17:42:40 (djcb)>
 SUBDIRS=$(MODEST_PLATFORM) widgets
-DIST_SUBDIRS = widgets gtk
+DIST_SUBDIRS = widgets gtk maemo
 
 INCLUDES=\
        $(MODEST_GSTUFF_CFLAGS)\
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_CFLAGS) \
        $(MODEST_LIBTINYMAIL_MAEMO_CFLAGS) \
+       -I ${top_srcdir}/src/widgets \
        -I$(MODEST_PLATFORM) \
        -DPREFIX=\"@prefix@\" \
-       -DMODESTLOCALEDIR=\""$(modestlocaledir)"\" \
+       -DMODEST_LOCALEDIR=\"$(MODEST_LOCALEDIR)\" \
        -DMODEST_PLATFORM=\"$(MODEST_PLATFORM)\" \
-       -DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID)
+       -DMODEST_PLATFORM_ID=$(MODEST_PLATFORM_ID) \
+       -DPIXMAP_PREFIX=\"${datadir}/pixmaps/modest/\" \
+       -DMODEST_UIDIR=\"$(datadir)/modest/ui/\"
 
 BUILT_SOURCES = modest-marshal.c modest-marshal.h
 
@@ -52,13 +55,12 @@ modest_SOURCES=\
        modest-protocol-mgr.c\
        modest-proto.h\
        modest-proto.c\
+       modest-ui.c\
        modest-ui.h\
        modest-text-utils.h\
        modest-text-utils.c\
        modest-tny-stream-gtkhtml.h\
        modest-tny-stream-gtkhtml.c\
-       modest-tny-attachment.h\
-       modest-tny-attachment.c\
        modest-marshal.c \
        modest-marshal.h \
        modest-mail-operation.c \
@@ -78,4 +80,11 @@ modest_LDADD =                                               \
        $(MODEST_PLATFORM)/libmodest-ui.la              \
        widgets/libmodest-widgets.la                    
 
-EXTRA_DIST=modest-marshal.list
+EXTRA_DIST=modest-marshal.list ui/*
+
+UI_FILES=\
+       ui/modest-ui.xml \
+       ui/modest-edit-msg-window-ui.xml
+
+uidir = $(datadir)/modest/ui
+ui_DATA = $(UI_FILES)