* Updated the SOURCES sections of Makefile.am's

* Added IT_PROG_INTLTOOL macro to configure.ac
* Fixed some problems with the documentation
* "make dist" is now working again

pmo-trunk-r645

diff --git a/Makefile.am b/Makefile.am
index aa69844..ef7cabc 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,6 @@
 # Makefile.am for modest
 # Time-stamp: <2006-12-10 12:55:27 (djcb)>
 #
-
 SUBDIRS= src po
 
 if BUILD_TESTS
@@ -13,6 +12,15 @@ if BUILD_DOCS
 SUBDIRS += docs
 endif
 
-EXTRA_DIST= config.rpath  config.rpath mkinstalldirs \
-       autogen.sh TODO COPYING intltool-extract.in intltool-merge.in \
+EXTRA_DIST=                 \
+       mkinstalldirs       \
+       autogen.sh          \
+       COPYING             \
+       intltool-extract.in \
+       intltool-merge.in   \
+       intltool-update.in
+
+DISTCLEANFILES =            \
+       intltool-extract.in \
+       intltool-merge.in   \
        intltool-update.in

diff --git a/configure.ac b/configure.ac
index 6fac77c..8378939 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,7 @@ AC_INIT([modest],[0.0.1],[http://maemo.org])
 AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_SRCDIR(src/modest-main.c)
-AM_INIT_AUTOMAKE(AC_PACKAGE_NAME,AC_PACKAGE_VERSION)
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
 
 # Check for gettext support
 GETTEXT_PACKAGE=modest
@@ -114,7 +114,8 @@ AM_CONDITIONAL(BUILD_DOCS, test x$build_docs = xtrue)
 dnl ## gtk-doc
 GTK_DOC_CHECK([1.0])
 
-
+dnl Intltool utility programs
+IT_PROG_INTLTOOL([0.35.0])
 
 
 AC_OUTPUT([

diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index a21a582..b9179ac 100644 (file)
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -56,7 +56,7 @@ HTML_IMAGES=
 # Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
 # e.g. content_files=running.sgml building.sgml changes-2.0.sgml
 content_files= \
-       xml/tree_index.sgml \
+#      xml/tree_index.sgml \
        modest-preface.sgml \
        modest-architecture.sgml \
        modest-design.sgml \

diff --git a/docs/reference/modest-docs.sgml b/docs/reference/modest-docs.sgml
index 7103886..d6d390d 100644 (file)
--- a/docs/reference/modest-docs.sgml
+++ b/docs/reference/modest-docs.sgml
@@ -38,7 +38,7 @@
 <!ENTITY gtk-ModestStoreWidget SYSTEM "xml/modest-store-widget.xml">
 <!ENTITY gtk-modestTransportWidget SYSTEM "xml/modest-transport-widget.xml">
 
-<!ENTITY index-Object-Tree SYSTEM "xml/tree_index.sgml">
+<!-- <!ENTITY index-Object-Tree SYSTEM "xml/tree_index.sgml"> -->
 
 <!ENTITY preface SYSTEM "modest-preface.sgml">
 <!ENTITY architecture SYSTEM "modest-architecture.sgml">
@@ -64,11 +64,12 @@
   
   &coding-guidelines;
   
+<!--
   <reference>
     <title>Object Index</title>
       &index-Object-Tree;
   </reference>
-  
+-->
   <reference>
     <title>API Reference</title>
       <chapter id="src">

diff --git a/src/Makefile.am b/src/Makefile.am
index f6e1528..449e654 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -68,6 +68,7 @@ modest_SOURCES=\
        modest-tny-platform-factory.h \
        modest-ui.c\
        modest-ui.h\
+       modest-ui-actions.h\
        modest-widget-factory.c \
        modest-widget-factory.h \
        modest-widget-memory.c\

diff --git a/src/gtk/Makefile.am b/src/gtk/Makefile.am
index 0cb1cfc..50edf4e 100644 (file)
--- a/src/gtk/Makefile.am
+++ b/src/gtk/Makefile.am
@@ -25,27 +25,22 @@ PIXMAP_FILES=\
        pixmaps/*.svg
 
 libmodest_ui_la_SOURCES=              \
-       modest-main-window.h          \
-       modest-main-window.c          \
-       modest-account-view-window.c  \
-       modest-account-view-window.h  \
        modest-account-assistant.c    \
        modest-account-assistant.h    \
+       modest-account-view-window.c  \
+       modest-account-view-window.h  \
        modest-edit-msg-window.c      \
-       modest-edit-msg-window.h      \
-       modest-transport-widget.c     \
-       modest-transport-widget.h     \
+       modest-icon-names.h           \
+       modest-main-window.c          \
        modest-store-widget.c         \
-       modest-store-widget.h
+       modest-store-widget.h         \
+       modest-transport-widget.c     \
+       modest-transport-widget.h     
 
 LDADD = \
        $(MODEST_GSTUFF_LIBS) \
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)
 
-EXTRA_DIST=\
-       pixmaps/* \
-       ui/*
-
 pixmapdir = $(datadir)/pixmaps/modest
 pixmap_DATA = $(PIXMAP_FILES)
 
@@ -55,3 +50,8 @@ UI_FILES=\
 
 uidir = $(datadir)/modest/ui
 ui_DATA = $(UI_FILES)
+
+EXTRA_DIST=\
+       $(UI_FILES) \
+       $(PIXMAP_FILES)
+

diff --git a/src/maemo/Makefile.am b/src/maemo/Makefile.am
index 13458cd..c39e931 100644 (file)
--- a/src/maemo/Makefile.am
+++ b/src/maemo/Makefile.am
@@ -18,32 +18,26 @@ INCLUDES=\
 noinst_LTLIBRARIES=\
        libmodest-ui.la
 
-PIXMAP_FILES=\
-       pixmaps/*.png 
-
 libmodest_ui_la_SOURCES=              \
-       modest-icon-names.h           \
-       modest-main-window.h          \
-       modest-main-window.c          \
+       modest-account-assistant.c    \
+       modest-account-assistant.h    \
        modest-account-view-window.c  \
        modest-account-view-window.h  \
        modest-edit-msg-window.c      \
-       modest-edit-msg-window.h      \
-       modest-transport-widget.c     \
-       modest-transport-widget.h     \
+       modest-icon-names.h           \
+       modest-main-window.c          \
        modest-store-widget.c         \
-       modest-store-widget.h 
+       modest-store-widget.h         \
+       modest-transport-widget.c     \
+       modest-transport-widget.h     
 
-#      modest-account-assistant.c    
-#      modest-account-assistant.h    
 
 LDADD = \
        $(MODEST_GSTUFF_LIBS) \
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)
 
-EXTRA_DIST=\
-       pixmaps/* \
-       ui/*
+PIXMAP_FILES=\
+       pixmaps/*.png 
 
 pixmapdir = $(datadir)/pixmaps/modest
 pixmap_DATA = $(PIXMAP_FILES)
@@ -53,4 +47,8 @@ UI_FILES=\
        ui/modest-edit-msg-window-ui.xml
 
 uidir = $(datadir)/modest/ui
-ui_DATA = $(UI_FILES)
\ No newline at end of file
+ui_DATA = $(UI_FILES)
+
+EXTRA_DIST=\
+       $(UI_FILES) \
+       $(PIXMAP_FILES)

diff --git a/src/widgets/Makefile.am b/src/widgets/Makefile.am
index 51020ef..61a75ca 100644 (file)
--- a/src/widgets/Makefile.am
+++ b/src/widgets/Makefile.am
@@ -19,22 +19,24 @@ noinst_LTLIBRARIES=\
 libmodest_widgets_la_SOURCES=       \
        modest-account-view.c       \
        modest-account-view.h       \
+       modest-combo-box.c          \
+       modest-combo-box.h          \
+       modest-edit-msg-window.h    \
+       modest-edit-msg-window-ui.h \
        modest-folder-view.c        \
        modest-folder-view.h        \
        modest-header-view.c        \
        modest-header-view.h        \
-       modest-header-view-render.c \
        modest-header-view-priv.h   \
-       modest-tny-stream-gtkhtml.c \
-       modest-tny-stream-gtkhtml.h \
+       modest-header-view-render.c \
+       modest-main-window.h        \
+       modest-main-window-ui.h     \
        modest-msg-view.c           \
        modest-msg-view.h           \
-       modest-combo-box.c          \
-       modest-combo-box.h          \
-       modest-window.h             \
-       modest-main-window.h        \
-       modest-edit-msg-window.h
- 
+       modest-tny-stream-gtkhtml.c \
+       modest-tny-stream-gtkhtml.h \
+       modest-window.h             
+
 LDADD = \
        $(MODEST_GSTUFF_LIBS)                           \
        $(MODEST_LIBTINYMAIL_GNOME_DESKTOP_LIBS)        \