2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f028cb1618..90886d13f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-01  Ettore Perazzoli  <ettore@ximian.com>
+
+	* Makefile.am (SUBDIRS): Build the composer after the addressbook,
+	as it needs some CORBA stuff from the latter.
+
 2001-06-30  Federico Mena Quintero  <federico@ximian.com>
 
 	* tools/killev: Added evolution-alarm-notify.
diff --git a/Makefile.am b/Makefile.am
index 96965070a3..83cb424373 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,11 +23,11 @@ SUBDIRS =			\
         libibex                 \
         camel                   \
         filter                  \
-        composer                \
         libical                 \
         libversit               \
 	libwombat		\
         addressbook             \
+        composer                \
         mail                    \
         calendar                \
         wombat                  \