aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog7
-rw-r--r--Makefile.am5
-rw-r--r--addressbook/ChangeLog10
-rw-r--r--addressbook/gui/component/Makefile.am5
-rw-r--r--addressbook/printing/Makefile.am8
-rw-r--r--calendar/ChangeLog5
-rw-r--r--calendar/gui/Makefile.am2
-rw-r--r--camel/ChangeLog8
-rw-r--r--camel/Makefile.am2
-rw-r--r--camel/providers/imap/Makefile.am1
-rw-r--r--composer/ChangeLog6
-rw-r--r--composer/Makefile.am7
-rw-r--r--configure.in2
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/Makefile.am6
-rw-r--r--ui/ChangeLog5
-rw-r--r--ui/Makefile.am12
17 files changed, 81 insertions, 15 deletions
diff --git a/ChangeLog b/ChangeLog
index 51f6049aa7..85dad472f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-19 Ettore Perazzoli <ettore@helixcode.com>
+
+ * configure.in (EVOLUTION_MICRO_VERSION): 6.
+
+ * Makefile.am (EXTRA_DIST): Remove `evolution.spec.in'.
+ (dist-hook:): Removed.
+
2000-10-18 Michael Meeks <michael@helixcode.com>
* notes/component-factory.c (control_activate, control_deactivate),
diff --git a/Makefile.am b/Makefile.am
index 3ab0d6962d..abbb985795 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -14,7 +14,6 @@ EXTRA_DIST = \
HACKING \
MAINTAINERS \
NEWS \
- evolution.spec.in \
$(appicon_DATA) \
$(application_DATA)
@@ -44,7 +43,3 @@ SUBDIRS = \
doc
-dist-hook: evolution.spec
- cp evolution.spec $(distdir)
-
-
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 531c07ec44..5daddb716c 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,13 @@
+2000-10-19 Ettore Perazzoli <ettore@helixcode.com>
+
+ * printing/Makefile.am (glade_DATA): Remove
+ `e-contact-print.glade.h'.
+ (EXTRA_DIST): Move here.
+
+ * gui/component/Makefile.am (glade_DATA): Remove
+ `ldap-server-dialog.glade.h'.
+ (EXTRA_DIST): Move here.
+
2000-10-19 Christopher James Lahey <clahey@helixcode.com>
* backend/ebook/e-card.c: Change how the extension field acts when
diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am
index 642c7f91c7..8813504989 100644
--- a/addressbook/gui/component/Makefile.am
+++ b/addressbook/gui/component/Makefile.am
@@ -60,11 +60,12 @@ oafdir = $(datadir)/oaf
oaf_DATA = addressbook.oafinfo
gladedir = $(datadir)/evolution/glade
-glade_DATA = ldap-server-dialog.glade ldap-server-dialog.glade.h
+glade_DATA = ldap-server-dialog.glade
EXTRA_DIST = \
$(glade_DATA) \
- $(oaf_DATA)
+ $(oaf_DATA) \
+ ldap-server-dialog.glade.h
if ENABLE_PURIFY
PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am
index a3156db610..4009415773 100644
--- a/addressbook/printing/Makefile.am
+++ b/addressbook/printing/Makefile.am
@@ -8,8 +8,7 @@ ecps_DATA = \
gladedir = $(datadir)/evolution/glade
glade_DATA = \
- e-contact-print.glade \
- e-contact-print.glade.h
+ e-contact-print.glade
INCLUDES = \
$(GNOME_INCLUDEDIR) \
@@ -62,4 +61,7 @@ contact_print_style_editor_test_LDADD = \
libecontactprint.a \
$(GNOME_PRINT_LIBS)
-EXTRA_DIST = $(glade_DATA) $(ecps_DATA)
+EXTRA_DIST = \
+ $(glade_DATA) \
+ $(ecps_DATA) \
+ e-contact-print.glade.h
diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index 03974500da..4b89f4f8be 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-19 Ettore Perazzoli <ettore@helixcode.com>
+
+ * gui/Makefile.am: Add `event-editor-dialog.glade.h'.
+ (EXTRA_DIST): Add `$(glade_messages)'.
+
2000-10-19 Michael Meeks <michael@helixcode.com>
* gui/calendar-commands.c (tb_print_cb): remove; redundant.
diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am
index 9b5a81a68a..cf9c385aa2 100644
--- a/calendar/gui/Makefile.am
+++ b/calendar/gui/Makefile.am
@@ -78,6 +78,7 @@ evolution_calendar_SOURCES = \
e-itip-control.c \
event-editor.c \
event-editor.h \
+ event-editor-dialog.glade.h \
getdate.y \
gncal-todo.c \
gncal-todo.h \
@@ -109,6 +110,7 @@ oaf_DATA = calendar-control.oafinfo evolution-calendar.oafinfo
EXTRA_DIST = \
$(glade_DATA) \
+ $(glade_messages) \
bell.xpm \
check-filled.xpm \
dayview.xpm \
diff --git a/camel/ChangeLog b/camel/ChangeLog
index 638fd4611d..7ef5319d97 100644
--- a/camel/ChangeLog
+++ b/camel/ChangeLog
@@ -1,3 +1,11 @@
+2000-10-19 Ettore Perazzoli <ettore@helixcode.com>
+
+ * providers/imap/Makefile.am (libcamelimapinclude_HEADERS): Add
+ `camel-imap-stream.h'.
+
+ * Makefile.am (libcamelinclude_HEADERS): Add `camel-charset-map.h'
+ and `camel-charset-map-private.h'.
+
2000-10-18 Jeffrey Stedfast <fejj@helixcode.com>
* camel-mime-part.c (camel_mime_part_set_description): The correct
diff --git a/camel/Makefile.am b/camel/Makefile.am
index 9d5c23d6dd..bc059ee197 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -66,6 +66,8 @@ libcamel_la_SOURCES = \
libcamelinclude_HEADERS = \
broken-date-parser.h \
camel-address.h \
+ camel-charset-map.h \
+ camel-charset-map-private.h \
camel-data-wrapper.h \
camel-exception-list.def \
camel-exception.h \
diff --git a/camel/providers/imap/Makefile.am b/camel/providers/imap/Makefile.am
index d4e4db8327..a6f5cbf3b1 100644
--- a/camel/providers/imap/Makefile.am
+++ b/camel/providers/imap/Makefile.am
@@ -31,6 +31,7 @@ libcamelimapinclude_HEADERS = \
camel-imap-command.h \
camel-imap-folder.h \
camel-imap-store.h \
+ camel-imap-stream.h \
camel-imap-summary.h \
camel-imap-utils.h
diff --git a/composer/ChangeLog b/composer/ChangeLog
index 3f38d969c1..3f82125033 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-19 Ettore Perazzoli <ettore@helixcode.com>
+
+ * Makefile.am (glade_data): Add `e-msg-composer-attachment.glade'.
+ (glade_messages): New.
+ (EXTRA_DIST): Add `$(glade_messages)'.
+
2000-10-19 Michael Meeks <michael@helixcode.com>
* e-msg-composer.c (create_menubar_file, create_menubar_edit),
diff --git a/composer/Makefile.am b/composer/Makefile.am
index 5d1b396bfc..3c62e05644 100644
--- a/composer/Makefile.am
+++ b/composer/Makefile.am
@@ -21,8 +21,10 @@ gladedir = $(datadir)/evolution/glade
glade_DATA = \
e-msg-composer-address-dialog.glade \
+ e-msg-composer-attachment.glade
+
+glade_messages = \
e-msg-composer-address-dialog.glade.h \
- e-msg-composer-attachment.glade \
e-msg-composer-attachment.glade.h
libcomposerincludedir = $(includedir)/composer
@@ -69,4 +71,5 @@ libcomposer_la_SOURCES = \
EXTRA_DIST = \
$(glade_DATA) \
- ChangeLog
+ $(glade_messages) \
+ bad-icon.xpm
diff --git a/configure.in b/configure.in
index 84e28bde7c..f8eb6d4120 100644
--- a/configure.in
+++ b/configure.in
@@ -6,7 +6,7 @@ cflags_set=${CFLAGS+set}
EVOLUTION_MAJOR_VERSION=0
EVOLUTION_MINOR_VERSION=0
-EVOLUTION_MICRO_VERSION=5
+EVOLUTION_MICRO_VERSION=6
VERSION=$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_VERSION
PACKAGE=evolution
diff --git a/mail/ChangeLog b/mail/ChangeLog
index fa40885c39..2ec50d0680 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-19 Ettore Perazzoli <ettore@helixcode.com>
+
+ * Makefile.am (glade_messages): New.
+ (EXTRA_DIST): Add `$(glade_messages)'.
+
2000-10-19 Dan Winship <danw@helixcode.com>
* mail-ops.c: Clean up some old #if 0 code.
diff --git a/mail/Makefile.am b/mail/Makefile.am
index 0b1b6a980b..0a3b3cfc0d 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -128,12 +128,16 @@ oaf_DATA = evolution-mail.oafinfo
gladedir = $(datadir)/evolution/glade
glade_DATA = mail-config.glade mail-config-druid.glade local-config.glade
+glade_messages = \
+ mail-config-druid.glade.h \
+ mail-config.glade.h
+
iconsdir = $(datadir)/images/evolution
$(EVOLUTION_MAIL_CORBA_GENERATED): Mail.idl
$(ORBIT_IDL) -I $(datadir)/idl -I `$(GNOME_CONFIG) --cflags idl` -I `$(GNOME_CONFIG) --datadir`/idl -I $(srcdir) $(srcdir)/Mail.idl
-EXTRA_DIST = Mail.idl $(glade_DATA) $(oaf_DATA)
+EXTRA_DIST = Mail.idl $(glade_DATA) $(oaf_DATA) $(glade_messages)
if ENABLE_PURIFY
PLINK = $(LIBTOOL) --mode=link $(PURIFY) $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 8d194b3944..1b11f2d030 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-19 Ettore Perazzoli <ettore@helixcode.com>
+
+ * Makefile.am (H_FILES): New.
+ (EXTRA_DIST): Add `$(H_FILES)'.
+
2000-10-19 Michael Meeks <michael@helixcode.com>
* evolution-message-composer.xml: add.
diff --git a/ui/Makefile.am b/ui/Makefile.am
index f570ad78ea..360214d628 100644
--- a/ui/Makefile.am
+++ b/ui/Makefile.am
@@ -11,10 +11,20 @@ XML_FILES = \
evolution-subscribe.xml \
evolution-task-editor-dialog.xml
+H_FILES = \
+ evolution.h \
+ evolution-addressbook.h \
+ evolution-addressbook-ldap.h \
+ evolution-contact-editor.h \
+ evolution-mail.h \
+ evolution-calendar.h \
+ evolution-subscribe.h \
+ evolution-executive-summary.h
+
uidir = $(datadir)/gnome/ui
ui_DATA = $(XML_FILES)
-EXTRA_DIST = $(XML_FILES)
+EXTRA_DIST = $(XML_FILES) $(H_FILES)
BUILT_SOURCES=$(XML_FILES:.xml=.h)