From 4a2777a279daf60afcb4ae2995e4b93c94bdab28 Mon Sep 17 00:00:00 2001 From: Christopher James Lahey Date: Wed, 10 May 2000 14:47:09 +0000 Subject: Removed dist-hook section. 2000-05-10 Christopher James Lahey * Makefile.am: Removed dist-hook section. * configure.in: Set the version number. Added a check for gnome window icons. Removed a bunch of unused Makefiles. * tools/Makefile.am: Created a proper EXTRA_DIST section. * widgets/e-text/Makefile.am: Added e-text-event-processor-types.h. From addressbook/ChangeLog: 2000-05-10 Christopher James Lahey * backend/ebook/Makefile.am: Added e-book-types.h, e-card-pairs.h, e-card-types.h. * backend/pas/Makefile.am: Added pas-backend-ldap.h. * contact-editor/Makefile.am: Added a proper EXTRA_DIST section. Removed some old defines. * ename/Makefile.am: Added e-name-western-tables.h. * gui/component/Makefile.am: Added e-ldap-server-dialog.h. Added a proper EXTRA_DIST section. * gui/minicard/e-reflow.c: Added a missed cast. * printing/Makefile.am: Added a proper EXTRA_DIST section. From calendar/ChangeLog: 2000-05-10 Christopher James Lahey * gui/Makefile.am: Added main.h. Combined the two EXTRA_DIST sections. From camel/ChangeLog: 2000-05-10 Christopher James Lahey * Makefile.am: Added camel-types.h, camel-folder-pt-proxy.h, and camel-thread-proxy.h. From default_user/ChangeLog: 2000-05-10 Christopher James Lahey * Makefile.am, local/Calendar/Makefile.am, local/Contacts/Makefile.am, local/Directories/Makefile.am, local/Directories/subfolders/Bigfoot/Makefile.am, local/Directories/subfolders/Netcenter/Makefile.am, local/Drafts/Makefile.am, local/Inbox/Makefile.am, local/Outbox/Makefile.am, local/Trash/Makefile.am: Created a proper EXTRA_DIST section. From filter/ChangeLog: 2000-05-10 Christopher James Lahey * filter-arg.h: Changed tree.h to gnome-xml/tree.h. * Makefile.am: Added filter-arg-types.h, filter-arg.h, filter-xml.h, filter-format.h, filter-druid.h, filter-editor.h. From libical/ChangeLog: 2000-05-10 Christopher James Lahey * configure.in: Reorder Makefiles so that it will build. From mail/ChangeLog: 2000-05-09 Christopher James Lahey * Makefile.am: Removed folder-browser-factory.h since it doesn't exist. Added mail-display.h, mail-types.h, pixmaps.h. From widgets/e-table/ChangeLog: 2000-05-10 Christopher James Lahey * Makefile.am: Added e-table-col-dnd.h and table-test.h. From wombat/ChangeLog: 2000-05-10 Christopher James Lahey * Makefile.am: Added an include for the pcs directory. svn path=/trunk/; revision=2966 --- ChangeLog | 12 ++++++++++ Makefile.am | 6 ----- addressbook/ChangeLog | 19 +++++++++++++++ addressbook/backend/ebook/Makefile.am | 3 +++ addressbook/backend/pas/Makefile.am | 2 +- addressbook/contact-editor/Makefile.am | 10 +++++--- addressbook/ename/Makefile.am | 2 ++ addressbook/gui/component/Makefile.am | 2 ++ addressbook/gui/contact-editor/Makefile.am | 10 +++++--- addressbook/gui/minicard/e-reflow.c | 2 +- addressbook/printing/Makefile.am | 2 ++ calendar/ChangeLog | 5 ++++ calendar/gui/Makefile.am | 9 ++++---- camel/ChangeLog | 5 ++++ camel/Makefile.am | 3 +++ configure.in | 23 ++++++++++-------- default_user/ChangeLog | 10 ++++++++ default_user/Makefile.am | 4 +++- default_user/local/Calendar/Makefile.am | 3 ++- default_user/local/Contacts/Makefile.am | 1 + default_user/local/Directories/Makefile.am | 3 +++ .../Directories/subfolders/Bigfoot/Makefile.am | 2 ++ .../Directories/subfolders/Netcenter/Makefile.am | 2 ++ default_user/local/Drafts/Makefile.am | 4 +++- default_user/local/Inbox/Makefile.am | 2 ++ default_user/local/Outbox/Makefile.am | 4 +++- default_user/local/Trash/Makefile.am | 4 +++- e-util/ename/Makefile.am | 2 ++ filter/ChangeLog | 7 ++++++ filter/Makefile.am | 10 +++++++- filter/filter-arg.h | 2 +- libical/ChangeLog | 4 ++++ libical/configure.in | 27 +++++++++++----------- mail/ChangeLog | 5 ++++ mail/Makefile.am | 11 +++++---- tools/Makefile.am | 4 +++- widgets/e-reflow/e-reflow.c | 2 +- widgets/e-table/ChangeLog | 4 ++++ widgets/e-table/Makefile.am | 4 +++- widgets/e-text/Makefile.am | 11 +++++---- widgets/misc/e-reflow.c | 2 +- wombat/ChangeLog | 4 ++++ wombat/Makefile.am | 1 + 43 files changed, 192 insertions(+), 62 deletions(-) diff --git a/ChangeLog b/ChangeLog index cda8affe3d..a69a13fb42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2000-05-10 Christopher James Lahey + + * Makefile.am: Removed dist-hook section. + + * configure.in: Set the version number. Added a check for gnome + window icons. Removed a bunch of unused Makefiles. + + * tools/Makefile.am: Created a proper EXTRA_DIST section. + + * widgets/e-text/Makefile.am: Added + e-text-event-processor-types.h. + 2000-05-09 Christopher James Lahey * art/Makefile.am: Added briefcase.png to get installed. diff --git a/Makefile.am b/Makefile.am index 62ebf01a4e..2d7330a8bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,9 +30,3 @@ SUBDIRS = \ default_user \ tools \ po - -dist-hook: - for subdir in intl ; do \ - mkdir $(distdir)/$$subdir ; \ - cp -pr $(srcdir)/$$subdir $(distdir) ; \ - done diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog index c2bfe40bd1..1f704740b9 100644 --- a/addressbook/ChangeLog +++ b/addressbook/ChangeLog @@ -1,3 +1,22 @@ +2000-05-10 Christopher James Lahey + + * backend/ebook/Makefile.am: Added e-book-types.h, e-card-pairs.h, + e-card-types.h. + + * backend/pas/Makefile.am: Added pas-backend-ldap.h. + + * contact-editor/Makefile.am: Added a proper EXTRA_DIST section. + Removed some old defines. + + * ename/Makefile.am: Added e-name-western-tables.h. + + * gui/component/Makefile.am: Added e-ldap-server-dialog.h. Added + a proper EXTRA_DIST section. + + * gui/minicard/e-reflow.c: Added a missed cast. + + * printing/Makefile.am: Added a proper EXTRA_DIST section. + 2000-05-09 Christopher James Lahey * contact-editor/e-contact-editor.c: Make sure that the canvas diff --git a/addressbook/backend/ebook/Makefile.am b/addressbook/backend/ebook/Makefile.am index 9b4634f49e..42399190ea 100644 --- a/addressbook/backend/ebook/Makefile.am +++ b/addressbook/backend/ebook/Makefile.am @@ -43,6 +43,7 @@ libebookincludedir = $(includedir)/evolution/ebook libebookinclude_HEADERS = \ e-book-listener.h \ + e-book-types.h \ e-book-view-listener.h \ e-book-view.h \ e-book.h \ @@ -50,7 +51,9 @@ libebookinclude_HEADERS = \ e-card-iterator.h \ e-card-list-iterator.h \ e-card-list.h \ + e-card-pairs.h \ e-card-simple.h \ + e-card-types.h \ e-card.h test_client_SOURCES = \ diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am index 98b158acfc..69fdeb41a7 100644 --- a/addressbook/backend/pas/Makefile.am +++ b/addressbook/backend/pas/Makefile.am @@ -21,7 +21,7 @@ INCLUDES = \ $(BONOBO_GNOME_CFLAGS) if ENABLE_LDAP -LDAP_BACKEND = pas-backend-ldap.c +LDAP_BACKEND = pas-backend-ldap.c pas-backend-ldap.h endif noinst_LIBRARIES = libpas.a diff --git a/addressbook/contact-editor/Makefile.am b/addressbook/contact-editor/Makefile.am index fdb25b98a3..3998e4fccb 100644 --- a/addressbook/contact-editor/Makefile.am +++ b/addressbook/contact-editor/Makefile.am @@ -1,8 +1,8 @@ imagesdir = $(datadir)/images/evolution -images = email.png head.png phone.png snailmail.png web.png arrow.png briefcase.png netmeeting.png netfreebusy.png +#images = email.png head.png phone.png snailmail.png web.png arrow.png briefcase.png netmeeting.png netfreebusy.png -EXTRA_DIST = $(images) -pkgdata_DATA = $(images) +#EXTRA_DIST = $(images) +#pkgdata_DATA = $(images) CPPFLAGS = \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ @@ -46,3 +46,7 @@ gladedir = $(datadir)/evolution/glade glade_DATA = \ contact-editor.glade \ fullname.glade + +EXTRA_DIST = $(glade_DATA) \ + e-contact-editor-strings.h \ + fullname-strings.h diff --git a/addressbook/ename/Makefile.am b/addressbook/ename/Makefile.am index 6b63d7dfaf..e30796574a 100644 --- a/addressbook/ename/Makefile.am +++ b/addressbook/ename/Makefile.am @@ -26,8 +26,10 @@ libename_la_SOURCES = \ libenameincludedir = $(includedir)/ename libenameinclude_HEADERS = \ + e-name-western-tables.h \ e-name-western.h + noinst_PROGRAMS = \ test-ename-western \ test-ename-western-gtk diff --git a/addressbook/gui/component/Makefile.am b/addressbook/gui/component/Makefile.am index 5a42c7e002..69a834722b 100644 --- a/addressbook/gui/component/Makefile.am +++ b/addressbook/gui/component/Makefile.am @@ -24,6 +24,7 @@ bin_PROGRAMS = \ evolution_addressbook_SOURCES = \ e-ldap-server-dialog.c \ + e-ldap-server-dialog.h \ e-addressbook-model.c \ e-addressbook-model.h \ addressbook-factory.c \ @@ -56,6 +57,7 @@ gladedir = $(datadir)/evolution/glade glade_DATA = ldap-server-dialog.glade EXTRA_DIST = \ + $(glade_DATA) \ addressbook.gnorba \ addressbook.oafinfo diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am index fdb25b98a3..3998e4fccb 100644 --- a/addressbook/gui/contact-editor/Makefile.am +++ b/addressbook/gui/contact-editor/Makefile.am @@ -1,8 +1,8 @@ imagesdir = $(datadir)/images/evolution -images = email.png head.png phone.png snailmail.png web.png arrow.png briefcase.png netmeeting.png netfreebusy.png +#images = email.png head.png phone.png snailmail.png web.png arrow.png briefcase.png netmeeting.png netfreebusy.png -EXTRA_DIST = $(images) -pkgdata_DATA = $(images) +#EXTRA_DIST = $(images) +#pkgdata_DATA = $(images) CPPFLAGS = \ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ @@ -46,3 +46,7 @@ gladedir = $(datadir)/evolution/glade glade_DATA = \ contact-editor.glade \ fullname.glade + +EXTRA_DIST = $(glade_DATA) \ + e-contact-editor-strings.h \ + fullname-strings.h diff --git a/addressbook/gui/minicard/e-reflow.c b/addressbook/gui/minicard/e-reflow.c index bd0fc99084..eee8e695c7 100644 --- a/addressbook/gui/minicard/e-reflow.c +++ b/addressbook/gui/minicard/e-reflow.c @@ -451,7 +451,7 @@ static void e_reflow_real_add_item(EReflow *e_reflow, GnomeCanvasItem *item) { e_reflow->items = g_list_append(e_reflow->items, item); - gtk_object_ref(item); + gtk_object_ref(GTK_OBJECT(item)); if ( GTK_OBJECT_FLAGS( e_reflow ) & GNOME_CANVAS_ITEM_REALIZED ) { gnome_canvas_item_set(item, "width", (double) e_reflow->column_width, diff --git a/addressbook/printing/Makefile.am b/addressbook/printing/Makefile.am index 7900653e26..0aa9dbef9d 100644 --- a/addressbook/printing/Makefile.am +++ b/addressbook/printing/Makefile.am @@ -43,3 +43,5 @@ gladedir = $(datadir)/evolution/glade glade_DATA = \ e-contact-print.glade +EXTRA_DIST = $(glade_DATA) + diff --git a/calendar/ChangeLog b/calendar/ChangeLog index 0cde991ba3..00eeb678be 100644 --- a/calendar/ChangeLog +++ b/calendar/ChangeLog @@ -1,3 +1,8 @@ +2000-05-10 Christopher James Lahey + + * gui/Makefile.am: Added main.h. Combined the two EXTRA_DIST + sections. + 2000-05-09 Christopher James Lahey * pcs/cal-backend-imc.c: Set the format when creating a new diff --git a/calendar/gui/Makefile.am b/calendar/gui/Makefile.am index 5d2804c6f5..3785d3df08 100644 --- a/calendar/gui/Makefile.am +++ b/calendar/gui/Makefile.am @@ -60,6 +60,7 @@ evolution_calendar_SOURCES = \ goto.c \ mark.c \ mark.h \ + main.h \ popup-menu.c \ popup-menu.h \ prop.c \ @@ -89,10 +90,6 @@ gnorbadir = $(sysconfdir)/CORBA/servers gnorba_DATA = calendar-control.gnorba endif -EXTRA_DIST = \ - calendar-control.gnorba \ - calendar-control.oafinfo - #calendar_pilot_sync_SOURCES = \ # GnomeCal-common.c \ # GnomeCal-stubs.c \ @@ -192,7 +189,9 @@ EXTRA_DIST = \ workweekview.xpm \ weekview.xpm \ monthview.xpm \ - yearview.xpm + yearview.xpm \ + calendar-control.gnorba \ + calendar-control.oafinfo # gnome-calendar-conduit.png # todo-conduit-control-applet.desktop diff --git a/camel/ChangeLog b/camel/ChangeLog index ed7a859dfe..f9190591b1 100644 --- a/camel/ChangeLog +++ b/camel/ChangeLog @@ -1,3 +1,8 @@ +2000-05-10 Christopher James Lahey + + * Makefile.am: Added camel-types.h, camel-folder-pt-proxy.h, and + camel-thread-proxy.h. + 2000-05-09 Dan Winship * providers/sendmail/camel-sendmail-transport.c (_send_internal): diff --git a/camel/Makefile.am b/camel/Makefile.am index 3b9eee05de..4910ecc1e2 100644 --- a/camel/Makefile.am +++ b/camel/Makefile.am @@ -105,6 +105,7 @@ libcamelinclude_HEADERS = \ camel-stream-fs.h \ camel-stream-mem.h \ camel-transport.h \ + camel-types.h \ camel-url.h \ gmime-content-field.h \ gstring-util.h \ @@ -122,7 +123,9 @@ libcamelinclude_HEADERS = \ camel-mime-filter-from.h \ camel-stream-filter.h \ camel-address.h \ + camel-folder-pt-proxy.h \ camel-internet-address.h \ + camel-thread-proxy.h \ $(pthread_HDR) libcamel_extra_sources = \ diff --git a/configure.in b/configure.in index 17c7e4eca5..450db33aed 100644 --- a/configure.in +++ b/configure.in @@ -6,8 +6,8 @@ cflags_set=${CFLAGS+set} EVOLUTION_MAJOR_VERSION=0 EVOLUTION_MINOR_VERSION=0 -EVOLUTION_MICRO_VERSION=1 -VERSION=$EVOLUTION_MAJOR_VERSION.$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_VERSION +EVOLUTION_MICRO_VERSION=0 +VERSION=$EVOLUTION_MINOR_VERSION.$EVOLUTION_MICRO_VERSION PACKAGE=evolution AM_INIT_AUTOMAKE($PACKAGE, $VERSION) @@ -48,6 +48,17 @@ fi AC_MSG_RESULT($system_mail_dir) AC_DEFINE_UNQUOTED(SYSTEM_MAIL_DIR, "$system_mail_dir") +dnl Check for new enough gnome-libs +CFLAGS_save=$CFLAGS +LIBS_save=$LIBS +CFLAGS=`gnome-config --cflags gnomeui` +LIBS=`gnome-config --libs gnomeui` + +AC_CHECK_LIB(gnomeui, gnome_window_icon_set_default_from_file, ,[ +AC_MSG_ERROR(gnome-libs 1.0.59 or higher is required.)]) + +CFLAGS=$CFLAGS_save +LIBS=$LIBS_save ALL_LINGUAS="da el fr gl ja nl no ru sv tr uk" @@ -410,18 +421,10 @@ e-util/Makefile libibex/Makefile camel/Makefile camel/providers/Makefile -camel/providers/MH/Makefile -camel/providers/maildir/Makefile camel/providers/mbox/Makefile -camel/providers/nntp/Makefile camel/providers/pop3/Makefile camel/providers/sendmail/Makefile -camel/providers/smtp/Makefile composer/Makefile -devel-docs/Makefile -devel-docs/camel/Makefile -tests/Makefile -tests/ui-tests/Makefile widgets/Makefile widgets/e-text/Makefile widgets/meeting-time-sel/Makefile diff --git a/default_user/ChangeLog b/default_user/ChangeLog index e658098a59..350928f894 100644 --- a/default_user/ChangeLog +++ b/default_user/ChangeLog @@ -1,3 +1,13 @@ +2000-05-10 Christopher James Lahey + + * Makefile.am, local/Calendar/Makefile.am, + local/Contacts/Makefile.am, local/Directories/Makefile.am, + local/Directories/subfolders/Bigfoot/Makefile.am, + local/Directories/subfolders/Netcenter/Makefile.am, + local/Drafts/Makefile.am, local/Inbox/Makefile.am, + local/Outbox/Makefile.am, local/Trash/Makefile.am: Created a + proper EXTRA_DIST section. + 2000-05-09 Christopher James Lahey * local/Directories/subfolders/Bigfoot/.cvsignore: New .cvsignore diff --git a/default_user/Makefile.am b/default_user/Makefile.am index 27bf515c18..2669874e5f 100644 --- a/default_user/Makefile.am +++ b/default_user/Makefile.am @@ -1,4 +1,6 @@ SUBDIRS = local defaultdir = $(prefix)/share/evolution/default_user -default_DATA = shortcuts.xml \ No newline at end of file +default_DATA = shortcuts.xml + +EXTRA_DIST = $(default_DATA) diff --git a/default_user/local/Calendar/Makefile.am b/default_user/local/Calendar/Makefile.am index a70c25d104..9117ae6373 100644 --- a/default_user/local/Calendar/Makefile.am +++ b/default_user/local/Calendar/Makefile.am @@ -1,2 +1,3 @@ defaultcalendardir = $(datadir)/evolution/default_user/local/Calendar -defaultcalendar_DATA = folder-metadata.xml \ No newline at end of file +defaultcalendar_DATA = folder-metadata.xml +EXTRA_DIST = $(defaultcalendar_DATA) diff --git a/default_user/local/Contacts/Makefile.am b/default_user/local/Contacts/Makefile.am index 9c66d823ed..6c0407f9e4 100644 --- a/default_user/local/Contacts/Makefile.am +++ b/default_user/local/Contacts/Makefile.am @@ -1,3 +1,4 @@ defaultcalendardir = $(datadir)/evolution/default_user/local/Contacts defaultcalendar_DATA = \ folder-metadata.xml +EXTRA_DIST = $(defaultcalendar_DATA) diff --git a/default_user/local/Directories/Makefile.am b/default_user/local/Directories/Makefile.am index de53ab6fed..64eb44d5b4 100644 --- a/default_user/local/Directories/Makefile.am +++ b/default_user/local/Directories/Makefile.am @@ -4,3 +4,6 @@ defaultdirectory_DATA = \ folder-metadata.xml SUBDIRS= subfolders + +EXTRA_DIST = $(defaultdirectory_DATA) + diff --git a/default_user/local/Directories/subfolders/Bigfoot/Makefile.am b/default_user/local/Directories/subfolders/Bigfoot/Makefile.am index c43cec7843..67f2f55a2a 100644 --- a/default_user/local/Directories/subfolders/Bigfoot/Makefile.am +++ b/default_user/local/Directories/subfolders/Bigfoot/Makefile.am @@ -3,3 +3,5 @@ defaultdirectorydir = $(datadir)/evolution/default_user/local/Directories/subfol defaultdirectory_DATA = \ folder-metadata.xml \ uri + +EXTRA_DIST = $(defaultdirectory_DATA) diff --git a/default_user/local/Directories/subfolders/Netcenter/Makefile.am b/default_user/local/Directories/subfolders/Netcenter/Makefile.am index 5b8f809577..aca286c422 100644 --- a/default_user/local/Directories/subfolders/Netcenter/Makefile.am +++ b/default_user/local/Directories/subfolders/Netcenter/Makefile.am @@ -3,3 +3,5 @@ defaultdirectorydir = $(datadir)/evolution/default_user/local/Directories/subfol defaultdirectory_DATA = \ folder-metadata.xml \ uri + +EXTRA_DIST = $(defaultdirectory_DATA) diff --git a/default_user/local/Drafts/Makefile.am b/default_user/local/Drafts/Makefile.am index fc5739ead6..144b8bb834 100644 --- a/default_user/local/Drafts/Makefile.am +++ b/default_user/local/Drafts/Makefile.am @@ -1,2 +1,4 @@ defaultcalendardir = $(datadir)/evolution/default_user/local/Drafts -defaultcalendar_DATA = folder-metadata.xml \ No newline at end of file +defaultcalendar_DATA = folder-metadata.xml + +EXTRA_DIST = $(defaultcalendar_DATA) diff --git a/default_user/local/Inbox/Makefile.am b/default_user/local/Inbox/Makefile.am index 9d0341c902..ed3ecd58d4 100644 --- a/default_user/local/Inbox/Makefile.am +++ b/default_user/local/Inbox/Makefile.am @@ -3,3 +3,5 @@ defaultcalendardir = $(datadir)/evolution/default_user/local/Inbox defaultcalendar_DATA = \ folder-metadata.xml \ mbox + +EXTRA_DIST = $(defaultcalendar_DATA) diff --git a/default_user/local/Outbox/Makefile.am b/default_user/local/Outbox/Makefile.am index 634aa6f720..d9ccc4dba4 100644 --- a/default_user/local/Outbox/Makefile.am +++ b/default_user/local/Outbox/Makefile.am @@ -1,2 +1,4 @@ defaultcalendardir = $(datadir)/evolution/default_user/local/Outbox -defaultcalendar_DATA = folder-metadata.xml \ No newline at end of file +defaultcalendar_DATA = folder-metadata.xml + +EXTRA_DIST = $(defaultcalendar_DATA) diff --git a/default_user/local/Trash/Makefile.am b/default_user/local/Trash/Makefile.am index 67a838c1b7..25def5bfe9 100644 --- a/default_user/local/Trash/Makefile.am +++ b/default_user/local/Trash/Makefile.am @@ -1,2 +1,4 @@ defaultcalendardir = $(datadir)/evolution/default_user/local/Trash -defaultcalendar_DATA = folder-metadata.xml \ No newline at end of file +defaultcalendar_DATA = folder-metadata.xml + +EXTRA_DIST = $(defaultcalendar_DATA) diff --git a/e-util/ename/Makefile.am b/e-util/ename/Makefile.am index 6b63d7dfaf..e30796574a 100644 --- a/e-util/ename/Makefile.am +++ b/e-util/ename/Makefile.am @@ -26,8 +26,10 @@ libename_la_SOURCES = \ libenameincludedir = $(includedir)/ename libenameinclude_HEADERS = \ + e-name-western-tables.h \ e-name-western.h + noinst_PROGRAMS = \ test-ename-western \ test-ename-western-gtk diff --git a/filter/ChangeLog b/filter/ChangeLog index 4a67900378..f2ea5f61b7 100644 --- a/filter/ChangeLog +++ b/filter/ChangeLog @@ -1,3 +1,10 @@ +2000-05-10 Christopher James Lahey + + * filter-arg.h: Changed tree.h to gnome-xml/tree.h. + + * Makefile.am: Added filter-arg-types.h, filter-arg.h, + filter-xml.h, filter-format.h, filter-druid.h, filter-editor.h. + 2000-05-02 Matt Loper * Makefile.am: set G_LOG_DOMAIN. diff --git a/filter/Makefile.am b/filter/Makefile.am index 9ad13e5afe..685c8d0b75 100644 --- a/filter/Makefile.am +++ b/filter/Makefile.am @@ -35,8 +35,16 @@ filter_driver_LDADD = \ libfilter_la_SOURCES = \ filter-arg-types.c \ + filter-arg-types.h \ filter-arg.c \ + filter-arg.h \ filter-xml.c \ + filter-xml.h \ filter-format.c \ + filter-format.h \ filter-druid.c \ - filter-editor.c + filter-druid.h \ + filter-editor.c \ + filter-editor.h + +EXTRA_DIST = blank.xpm check.xpm diff --git a/filter/filter-arg.h b/filter/filter-arg.h index 8193de14c1..514bf1adf2 100644 --- a/filter/filter-arg.h +++ b/filter/filter-arg.h @@ -25,7 +25,7 @@ #include #include -#include /* gnome-xml */ +#include /* gnome-xml */ #define FILTER_ARG(obj) GTK_CHECK_CAST (obj, filter_arg_get_type (), FilterArg) #define FILTER_ARG_CLASS(klass) GTK_CHECK_CLASS_CAST (klass, filter_arg_get_type (), FilterArgClass) diff --git a/libical/ChangeLog b/libical/ChangeLog index 8d52ef882e..ae508c17e1 100644 --- a/libical/ChangeLog +++ b/libical/ChangeLog @@ -1,3 +1,7 @@ +2000-05-10 Christopher James Lahey + + * configure.in: Reorder Makefiles so that it will build. + 2000-04-27 Ettore Perazzoli * src/test/Makefile.am diff --git a/libical/configure.in b/libical/configure.in index f009730e1e..db9177b3b3 100644 --- a/libical/configure.in +++ b/libical/configure.in @@ -35,16 +35,17 @@ AC_STRUCT_TM dnl Checks for library functions. AC_CHECK_FUNCS(strdup) -AC_OUTPUT(\ -src/libical/icalversion.h \ -config.h \ -src/libical/Makefile \ -src/libicalss/Makefile \ -src/test/Makefile \ -src/Makefile \ -design-data/Makefile \ -doc/Makefile \ -scripts/Makefile \ -test-data/Makefile \ -src/Makefile \ -Makefile ) +AC_OUTPUT([ +Makefile +src/Makefile +src/libical/Makefile +src/libical/icalversion.h +src/libicalss/Makefile +src/test/Makefile +design-data/Makefile +doc/Makefile +scripts/Makefile +test-data/Makefile +src/Makefile +config.h +]) diff --git a/mail/ChangeLog b/mail/ChangeLog index 6836f0db1c..848a676a17 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,8 @@ +2000-05-09 Christopher James Lahey + + * Makefile.am: Removed folder-browser-factory.h since it doesn't + exist. Added mail-display.h, mail-types.h, pixmaps.h. + 2000-05-09 Matt Loper * folder-browser-factory.c (control_activate): Remove "File->mail" diff --git a/mail/Makefile.am b/mail/Makefile.am index 6ea1b09721..83c047e632 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -2,8 +2,9 @@ bin_PROGRAMS = evolution-mail test-mail providerdir = $(libdir)/evolution/camel-providers/$(VERSION) -EXTRA_DIST = e-attchmt.png -pkgdata_DATA = e-attchmt.png +#imagesdir = $(datadir)/images/evolution +#images_DATA = e-attchmt.png +#EXTRA_DIST = $(image_DATA) INCLUDES = \ -I$(top_srcdir)/widgets \ @@ -30,17 +31,19 @@ evolution_mail_SOURCES = \ folder-browser.c \ folder-browser.h \ folder-browser-factory.c \ - folder-browser-factory.h \ mail-config.c \ mail-display.c \ + mail-display.h \ mail-format.c \ mail-identify.c \ mail-ops.c \ + mail-types.h \ main.c \ message-list.c \ message-list.h \ session.c \ - mail.h + mail.h \ + pixmaps.h evolution_mail_LDADD = \ diff --git a/tools/Makefile.am b/tools/Makefile.am index bca2f2c87c..ca1ad433ed 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -1 +1,3 @@ -bin_SCRIPTS = killev \ No newline at end of file +bin_SCRIPTS = killev + +EXTRA_DIST = $(bin_SCRIPTS) diff --git a/widgets/e-reflow/e-reflow.c b/widgets/e-reflow/e-reflow.c index bd0fc99084..eee8e695c7 100644 --- a/widgets/e-reflow/e-reflow.c +++ b/widgets/e-reflow/e-reflow.c @@ -451,7 +451,7 @@ static void e_reflow_real_add_item(EReflow *e_reflow, GnomeCanvasItem *item) { e_reflow->items = g_list_append(e_reflow->items, item); - gtk_object_ref(item); + gtk_object_ref(GTK_OBJECT(item)); if ( GTK_OBJECT_FLAGS( e_reflow ) & GNOME_CANVAS_ITEM_REALIZED ) { gnome_canvas_item_set(item, "width", (double) e_reflow->column_width, diff --git a/widgets/e-table/ChangeLog b/widgets/e-table/ChangeLog index 2f0457a3ff..74899eeb4a 100644 --- a/widgets/e-table/ChangeLog +++ b/widgets/e-table/ChangeLog @@ -1,3 +1,7 @@ +2000-05-10 Christopher James Lahey + + * Makefile.am: Added e-table-col-dnd.h and table-test.h. + 2000-05-09 Christopher James Lahey * e-table-subset-variable.c: Fixed etssv_remove. diff --git a/widgets/e-table/Makefile.am b/widgets/e-table/Makefile.am index cdfe579b82..34e4005fcd 100644 --- a/widgets/e-table/Makefile.am +++ b/widgets/e-table/Makefile.am @@ -31,6 +31,7 @@ libetable_a_SOURCES = \ e-cell-toggle.h \ e-table.c \ e-table.h \ + e-table-col-dnd.h \ e-table-col.c \ e-table-col.h \ e-table-config.c \ @@ -71,7 +72,8 @@ table_test_SOURCES = \ test-table.c \ test-check.c \ test-cols.c \ - table-test.c + table-test.c \ + table-test.h table_test_LDADD = \ libetable.a \ diff --git a/widgets/e-text/Makefile.am b/widgets/e-text/Makefile.am index 3725b20fb4..362a9de3a5 100644 --- a/widgets/e-text/Makefile.am +++ b/widgets/e-text/Makefile.am @@ -7,14 +7,15 @@ noinst_LIBRARIES = \ libetext.a libetext_a_SOURCES = \ - e-text.c \ - e-text.h \ - e-text-event-processor.c \ - e-text-event-processor.h \ e-text-event-processor-emacs-like.c \ e-text-event-processor-emacs-like.h \ + e-text-event-processor-types.h \ + e-text-event-processor.c \ + e-text-event-processor.h \ e-text-model.c \ - e-text-model.h + e-text-model.h \ + e-text.c \ + e-text.h noinst_PROGRAMS = \ e-text-test diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c index bd0fc99084..eee8e695c7 100644 --- a/widgets/misc/e-reflow.c +++ b/widgets/misc/e-reflow.c @@ -451,7 +451,7 @@ static void e_reflow_real_add_item(EReflow *e_reflow, GnomeCanvasItem *item) { e_reflow->items = g_list_append(e_reflow->items, item); - gtk_object_ref(item); + gtk_object_ref(GTK_OBJECT(item)); if ( GTK_OBJECT_FLAGS( e_reflow ) & GNOME_CANVAS_ITEM_REALIZED ) { gnome_canvas_item_set(item, "width", (double) e_reflow->column_width, diff --git a/wombat/ChangeLog b/wombat/ChangeLog index 25ff905961..7315c777d7 100644 --- a/wombat/ChangeLog +++ b/wombat/ChangeLog @@ -1,3 +1,7 @@ +2000-05-10 Christopher James Lahey + + * Makefile.am: Added an include for the pcs directory. + 2000-05-08 Federico Mena Quintero * wombat.c (setup_pcs): Register the "file" method with the IMC diff --git a/wombat/Makefile.am b/wombat/Makefile.am index 09a153c8b6..e6d7cf169f 100644 --- a/wombat/Makefile.am +++ b/wombat/Makefile.am @@ -7,6 +7,7 @@ INCLUDES = \ -I$(top_srcdir)/addressbook/backend \ -I$(top_builddir)/addressbook/backend \ -I$(top_srcdir)/calendar \ + -I$(top_srcdir)/calendar/pcs \ -DEVOLUTION_VERSION=\""$(VERSION)"\" \ -DEVOLUTION_LOCALEDIR=\""$(datadir)/locale"\" -- cgit v1.2.3