aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook')
-rw-r--r--addressbook/ChangeLog19
-rw-r--r--addressbook/backend/ebook/Makefile.am3
-rw-r--r--addressbook/backend/pas/Makefile.am2
-rw-r--r--addressbook/contact-editor/Makefile.am10
-rw-r--r--addressbook/ename/Makefile.am2
-rw-r--r--addressbook/gui/component/Makefile.am2
-rw-r--r--addressbook/gui/contact-editor/Makefile.am10
-rw-r--r--addressbook/gui/minicard/e-reflow.c2
-rw-r--r--addressbook/printing/Makefile.am2
9 files changed, 44 insertions, 8 deletions
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 <clahey@helixcode.com>
+
+ * 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 <clahey@helixcode.com>
* 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)
+