[Evolution] Addressbook lib/headers patch
- From: Federico Mena Quintero <federico helixcode com>
- To: Chris Lahey <clahey helixcode com>, evolution helixcode com
- Subject: [Evolution] Addressbook lib/headers patch
- Date: Wed, 19 Apr 2000 19:21:38 -0500
Chris,
Here is the patch to fix most of the addressbook's library/headers
issues. Now it only installs the public libraries and public headers,
and creates static libraries for the public stuff.
I think I covered everything, but a directory or two may have slipped
through. I did check that it works for builddir != srcdir. Could you
please check it for correctness and tell me if I should commit it?
My next patch after this one will be to add a signal to the
addressbook factory to inform Wombat when the last client
disconnects. It will be very similar to the stuff I put in the
PCS.
Thanks,
Federico
Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1
diff -u -r1.1 ChangeLog
--- addressbook/ChangeLog 2000/04/17 19:20:23 1.1
+++ addressbook/ChangeLog 2000/04/20 00:08:44
@@ -1,3 +1,28 @@
-2000-04-17 Federico Mena Quintero <federico helixcode com>
+2000-04-18 Federico Mena Quintero <federico helixcode com>
+
+ * gui/minicard/Makefile.am (INCLUDES): Use "e-minicard" as the log
+ domain.
+
+ * gui/component/Makefile.am (INCLUDES): Use
+ "evolution-addressbook" as the log domain.
+
+ * backend/pas/Makefile.am: Build libpas.a, not a shared library.
+ Do not install any header files.
+ (INCLUDES): Remove spurious include paths.
+
+ * backend/pas/*.[ch]: Fix includes.
+
+ * backend/ebook/Makefile.am: Do not install the test programs.
+ Fixed some include weirdness.
+
+ * backend/ebook/*.[ch]: Fix includes.
+
+ * contact-editor/Makefile.am (INCLUDES): Set the log domain to
+ "contact-editor".
+ (INCLUDES): Fix.
+
+ * contact-editor/*.[ch]: Fix includes.
+
+ * gui/minicard/*.[ch]: Fix includes.
* ChangeLog: Started a ChangeLog here.
Index: addressbook/backend/ebook/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/Makefile.am,v
retrieving revision 1.8
diff -u -r1.8 Makefile.am
--- addressbook/backend/ebook/Makefile.am 2000/04/14 22:42:33 1.8
+++ addressbook/backend/ebook/Makefile.am 2000/04/20 00:08:44
@@ -1,4 +1,4 @@
-bin_PROGRAMS = test-card test-client test-client-list
+noinst_PROGRAMS = test-card test-client test-client-list
corbadir = $(sysconfdir)/CORBA/servers
@@ -19,11 +19,9 @@
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-DG_LOG_DOMAIN=\"EBook\" \
- -I$(builddir) \
- -I$(srcdir) -I$(top_srcdir) \
- -I$(srcdir)/. \
- -I$(srcdir)/.. \
- -I$(includedir) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
$(GNOME_INCLUDEDIR)
gnome_libs = \
@@ -50,7 +48,7 @@
e-card-list.c \
e-card.c
-libebookincludedir = $(includedir)/backend
+libebookincludedir = $(includedir)/evolution/ebook
libebookinclude_HEADERS = \
e-book-listener.h \
Index: addressbook/backend/ebook/e-book-listener.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-book-listener.c,v
retrieving revision 1.7
diff -u -r1.7 e-book-listener.c
--- addressbook/backend/ebook/e-book-listener.c 2000/04/03 15:03:54 1.7
+++ addressbook/backend/ebook/e-book-listener.c 2000/04/20 00:08:45
@@ -9,8 +9,9 @@
* Copyright 2000, Helix Code, Inc.
*/
+#include <config.h>
#include <gtk/gtksignal.h>
-#include <e-book-listener.h>
+#include "e-book-listener.h"
static EBookStatus e_book_listener_convert_status (Evolution_BookListener_CallStatus status);
Index: addressbook/backend/ebook/e-book-listener.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-book-listener.h,v
retrieving revision 1.5
diff -u -r1.5 e-book-listener.h
--- addressbook/backend/ebook/e-book-listener.h 2000/04/03 15:03:54 1.5
+++ addressbook/backend/ebook/e-book-listener.h 2000/04/20 00:08:45
@@ -14,8 +14,8 @@
#include <libgnome/gnome-defs.h>
#include <bonobo/bonobo-object.h>
-#include <addressbook.h>
-#include <e-book-types.h>
+#include <ebook/addressbook.h>
+#include <ebook/e-book-types.h>
BEGIN_GNOME_DECLS
Index: addressbook/backend/ebook/e-book-view-listener.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-book-view-listener.c,v
retrieving revision 1.1
diff -u -r1.1 e-book-view-listener.c
--- addressbook/backend/ebook/e-book-view-listener.c 2000/04/03 15:03:54 1.1
+++ addressbook/backend/ebook/e-book-view-listener.c 2000/04/20 00:08:46
@@ -9,10 +9,11 @@
* Copyright 2000, Helix Code, Inc.
*/
+#include <config.h>
#include <gtk/gtksignal.h>
-#include <e-book-view-listener.h>
-#include <e-book-view.h>
-#include <e-card.h>
+#include "e-book-view-listener.h"
+#include "e-book-view.h"
+#include "e-card.h"
enum {
RESPONSES_QUEUED,
Index: addressbook/backend/ebook/e-book-view-listener.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-book-view-listener.h,v
retrieving revision 1.1
diff -u -r1.1 e-book-view-listener.h
--- addressbook/backend/ebook/e-book-view-listener.h 2000/04/03 15:03:54 1.1
+++ addressbook/backend/ebook/e-book-view-listener.h 2000/04/20 00:08:46
@@ -14,7 +14,7 @@
#include <libgnome/gnome-defs.h>
#include <bonobo/bonobo-object.h>
-#include <addressbook.h>
+#include <ebook/addressbook.h>
BEGIN_GNOME_DECLS
Index: addressbook/backend/ebook/e-book-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-book-view.c,v
retrieving revision 1.4
diff -u -r1.4 e-book-view.c
--- addressbook/backend/ebook/e-book-view.c 2000/04/11 00:21:08 1.4
+++ addressbook/backend/ebook/e-book-view.c 2000/04/20 00:08:46
@@ -8,13 +8,14 @@
* Copyright 1999, 2000, Helix Code, Inc.
*/
-#include <addressbook.h>
+#include <config.h>
#include <libgnorba/gnorba.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkmarshal.h>
-#include <e-card-cursor.h>
-#include <e-book-view-listener.h>
-#include <e-book-view.h>
+#include "addressbook.h"
+#include "e-card-cursor.h"
+#include "e-book-view-listener.h"
+#include "e-book-view.h"
GtkObjectClass *e_book_view_parent_class;
Index: addressbook/backend/ebook/e-book-view.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-book-view.h,v
retrieving revision 1.2
diff -u -r1.2 e-book-view.h
--- addressbook/backend/ebook/e-book-view.h 2000/04/04 19:30:27 1.2
+++ addressbook/backend/ebook/e-book-view.h 2000/04/20 00:08:46
@@ -13,8 +13,8 @@
#include <libgnome/gnome-defs.h>
-#include <e-card.h>
-#include <e-book-view-listener.h>
+#include <ebook/e-card.h>
+#include <ebook/e-book-view-listener.h>
BEGIN_GNOME_DECLS
Index: addressbook/backend/ebook/e-book.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-book.c,v
retrieving revision 1.11
diff -u -r1.11 e-book.c
--- addressbook/backend/ebook/e-book.c 2000/04/11 00:21:08 1.11
+++ addressbook/backend/ebook/e-book.c 2000/04/20 00:08:49
@@ -8,13 +8,14 @@
* Copyright 1999, 2000, Helix Code, Inc.
*/
-#include <addressbook.h>
+#include <config.h>
#include <libgnorba/gnorba.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkmarshal.h>
-#include <e-card-cursor.h>
-#include <e-book-listener.h>
-#include <e-book.h>
+#include "addressbook.h"
+#include "e-card-cursor.h"
+#include "e-book-listener.h"
+#include "e-book.h"
GtkObjectClass *e_book_parent_class;
Index: addressbook/backend/ebook/e-book.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-book.h,v
retrieving revision 1.5
diff -u -r1.5 e-book.h
--- addressbook/backend/ebook/e-book.h 2000/04/04 19:30:28 1.5
+++ addressbook/backend/ebook/e-book.h 2000/04/20 00:08:49
@@ -13,10 +13,10 @@
#include <libgnome/gnome-defs.h>
-#include <e-card.h>
-#include <e-card-cursor.h>
-#include <e-book-view.h>
-#include <e-book-types.h>
+#include <ebook/e-card.h>
+#include <ebook/e-card-cursor.h>
+#include <ebook/e-book-view.h>
+#include <ebook/e-book-types.h>
BEGIN_GNOME_DECLS
Index: addressbook/backend/ebook/e-card-cursor.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-card-cursor.h,v
retrieving revision 1.4
diff -u -r1.4 e-card-cursor.h
--- addressbook/backend/ebook/e-card-cursor.h 2000/04/14 22:42:33 1.4
+++ addressbook/backend/ebook/e-card-cursor.h 2000/04/20 00:08:49
@@ -12,8 +12,8 @@
#include <libgnome/gnome-defs.h>
#include <gtk/gtk.h>
-#include "addressbook/backend/ebook/addressbook.h"
-#include "e-card.h"
+#include <ebook/addressbook.h>
+#include <ebook/e-card.h>
BEGIN_GNOME_DECLS
Index: addressbook/backend/ebook/e-card-iterator.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-card-iterator.c,v
retrieving revision 1.2
diff -u -r1.2 e-card-iterator.c
--- addressbook/backend/ebook/e-card-iterator.c 2000/04/04 20:58:45 1.2
+++ addressbook/backend/ebook/e-card-iterator.c 2000/04/20 00:08:50
@@ -10,7 +10,7 @@
#include <config.h>
#include <gtk/gtk.h>
-#include <e-card-iterator.h>
+#include "e-card-iterator.h"
#define ECI_CLASS(object) (E_CARD_ITERATOR_CLASS(GTK_OBJECT((object))->klass))
Index: addressbook/backend/ebook/e-card-list-iterator.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-card-list-iterator.c,v
retrieving revision 1.2
diff -u -r1.2 e-card-list-iterator.c
--- addressbook/backend/ebook/e-card-list-iterator.c 2000/04/04 20:58:45 1.2
+++ addressbook/backend/ebook/e-card-list-iterator.c 2000/04/20 00:08:50
@@ -10,8 +10,8 @@
#include <config.h>
#include <gtk/gtk.h>
-#include <e-card-list-iterator.h>
-#include <e-card-list.h>
+#include "e-card-list-iterator.h"
+#include "e-card-list.h"
static void e_card_list_iterator_init (ECardListIterator *card);
static void e_card_list_iterator_class_init (ECardListIteratorClass *klass);
Index: addressbook/backend/ebook/e-card-list-iterator.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-card-list-iterator.h,v
retrieving revision 1.2
diff -u -r1.2 e-card-list-iterator.h
--- addressbook/backend/ebook/e-card-list-iterator.h 2000/04/08 22:10:38 1.2
+++ addressbook/backend/ebook/e-card-list-iterator.h 2000/04/20 00:08:50
@@ -13,8 +13,8 @@
#include <time.h>
#include <gtk/gtk.h>
#include <stdio.h>
-#include <e-card-iterator.h>
-#include <e-card-list.h>
+#include <ebook/e-card-iterator.h>
+#include <ebook/e-card-list.h>
#define E_TYPE_CARD_LIST_ITERATOR (e_card_list_iterator_get_type ())
#define E_CARD_LIST_ITERATOR(obj) (GTK_CHECK_CAST ((obj), E_TYPE_CARD_LIST_ITERATOR,
ECardListIterator))
Index: addressbook/backend/ebook/e-card-list.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-card-list.c,v
retrieving revision 1.2
diff -u -r1.2 e-card-list.c
--- addressbook/backend/ebook/e-card-list.c 2000/04/04 20:58:45 1.2
+++ addressbook/backend/ebook/e-card-list.c 2000/04/20 00:08:50
@@ -10,8 +10,8 @@
#include <config.h>
#include <gtk/gtk.h>
-#include <e-card-list.h>
-#include <e-card-list-iterator.h>
+#include "e-card-list.h"
+#include "e-card-list-iterator.h"
#define ECL_CLASS(object) (E_CARD_LIST_CLASS(GTK_OBJECT((object))->klass))
Index: addressbook/backend/ebook/e-card-list.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-card-list.h,v
retrieving revision 1.2
diff -u -r1.2 e-card-list.h
--- addressbook/backend/ebook/e-card-list.h 2000/04/04 20:58:45 1.2
+++ addressbook/backend/ebook/e-card-list.h 2000/04/20 00:08:50
@@ -13,7 +13,7 @@
#include <time.h>
#include <gtk/gtk.h>
#include <stdio.h>
-#include <e-card-iterator.h>
+#include <ebook/e-card-iterator.h>
#define E_TYPE_CARD_LIST (e_card_list_get_type ())
#define E_CARD_LIST(obj) (GTK_CHECK_CAST ((obj), E_TYPE_CARD_LIST, ECardList))
Index: addressbook/backend/ebook/e-card-pairs.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-card-pairs.h,v
retrieving revision 1.4
diff -u -r1.4 e-card-pairs.h
--- addressbook/backend/ebook/e-card-pairs.h 2000/03/28 03:52:45 1.4
+++ addressbook/backend/ebook/e-card-pairs.h 2000/04/20 00:08:51
@@ -23,8 +23,8 @@
#ifndef __E_CARD_PAIRS_H__
#define __E_CARD_PAIRS_H__
-#include "libversit/vcc.h"
-#include <e-card.h>
+#include <libversit/vcc.h>
+#include <ebook/e-card.h>
#if 0
Index: addressbook/backend/ebook/e-card.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-card.c,v
retrieving revision 1.19
diff -u -r1.19 e-card.c
--- addressbook/backend/ebook/e-card.c 2000/04/16 21:06:01 1.19
+++ addressbook/backend/ebook/e-card.c 2000/04/20 00:08:55
@@ -14,9 +14,9 @@
#include <string.h>
#include <gtk/gtk.h>
-#include "libversit/vcc.h"
-#include <e-card.h>
-#include <e-card-pairs.h>
+#include <libversit/vcc.h>
+#include "e-card.h"
+#include "e-card-pairs.h"
#define is_a_prop_of(obj,prop) (isAPropertyOf ((obj),(prop)))
#define str_val(obj) (the_str = (vObjectValueType (obj))? fakeCString (vObjectUStringZValue (obj)) : calloc
(1, 1))
Index: addressbook/backend/ebook/e-card.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/e-card.h,v
retrieving revision 1.14
diff -u -r1.14 e-card.h
--- addressbook/backend/ebook/e-card.h 2000/04/16 21:06:01 1.14
+++ addressbook/backend/ebook/e-card.h 2000/04/20 00:08:59
@@ -15,8 +15,8 @@
#include <time.h>
#include <gtk/gtk.h>
#include <stdio.h>
-#include <e-card-types.h>
-#include <e-card-list.h>
+#include <ebook/e-card-types.h>
+#include <ebook/e-card-list.h>
#define E_TYPE_CARD (e_card_get_type ())
#define E_CARD(obj) (GTK_CHECK_CAST ((obj), E_TYPE_CARD, ECard))
Index: addressbook/backend/ebook/test-card.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/test-card.c,v
retrieving revision 1.8
diff -u -r1.8 test-card.c
--- addressbook/backend/ebook/test-card.c 2000/04/16 21:06:01 1.8
+++ addressbook/backend/ebook/test-card.c 2000/04/20 00:08:59
@@ -1,5 +1,5 @@
#include <gnome.h>
-#include <e-card.h>
+#include "e-card.h"
#define TEST_VCARD \
"BEGIN:VCARD
" \
Index: addressbook/backend/ebook/test-client-list.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/test-client-list.c,v
retrieving revision 1.2
diff -u -r1.2 test-client-list.c
--- addressbook/backend/ebook/test-client-list.c 2000/04/03 15:03:54 1.2
+++ addressbook/backend/ebook/test-client-list.c 2000/04/20 00:08:59
@@ -4,7 +4,7 @@
#include <gnome.h>
#include <libgnorba/gnorba.h>
-#include <e-book.h>
+#include "e-book.h"
CORBA_Environment ev;
CORBA_ORB orb;
Index: addressbook/backend/pas/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/pas/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- addressbook/backend/pas/Makefile.am 2000/04/14 22:42:37 1.10
+++ addressbook/backend/pas/Makefile.am 2000/04/20 00:08:59
@@ -1,7 +1,3 @@
-lib_LTLIBRARIES = libpas.la
-
-corbadir = $(sysconfdir)/CORBA/servers
-
CORBA_SOURCE = \
addressbook.h \
addressbook-common.c \
@@ -18,45 +14,32 @@
INCLUDES = \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- -DG_LOG_DOMAIN=\"Wombat\" \
- -I$(builddir) \
- -I$(srcdir) -I$(top_srcdir) \
- -I$(srcdir)/. \
- -I$(srcdir)/.. \
- -I$(top_builddir) \
- -I$(includedir) \
- -I$(top_srcdir)/e-util \
- -I$(top_srcdir)/addressbook/backend/ebook \
+ -DG_LOG_DOMAIN=\"wombat-pas\" \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
$(GNOME_INCLUDEDIR)
-gnome_libs = \
- $(GNOME_LIBDIR) \
- $(GNOMEUI_LIBS) \
- $(GNOMEGNORBA_LIBS) \
- $(INTLLIBS)
-
if ENABLE_LDAP
LDAP_BACKEND = pas-backend-ldap.c
endif
+
+noinst_LIBRARIES = libpas.a
-libpas_la_SOURCES = \
+libpas_a_SOURCES = \
$(CORBA_SOURCE) \
pas-book-factory.c \
+ pas-book-factory.h \
pas-book-view.c \
+ pas-book-view.h \
pas-book.c \
+ pas-book.h \
pas-backend-file.c \
+ pas-backend-file.h \
$(LDAP_BACKEND) \
pas-backend.c \
- pas-card-cursor.c
-
-libpasincludedir = $(includedir)/backend
-
-libpasinclude_HEADERS = \
- pas-book-factory.h \
- pas-book-view.h \
- pas-book.h \
- pas-backend-file.h \
pas-backend.h \
+ pas-card-cursor.c \
pas-card-cursor.h
BUILT_SOURCES = $(CORBA_SOURCE)
Index: addressbook/backend/pas/pas-backend-file.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/pas/pas-backend-file.c,v
retrieving revision 1.30
diff -u -r1.30 pas-backend-file.c
--- addressbook/backend/pas/pas-backend-file.c 2000/04/16 21:06:01 1.30
+++ addressbook/backend/pas/pas-backend-file.c 2000/04/20 00:08:59
@@ -16,11 +16,11 @@
#include <db.h>
#endif
-#include <pas-backend-file.h>
-#include <pas-book.h>
-#include <pas-card-cursor.h>
-#include <e-card.h>
-#include <e-sexp.h>
+#include "pas-backend-file.h"
+#include "pas-book.h"
+#include "pas-card-cursor.h"
+#include <ebook/e-card.h>
+#include <e-util/e-sexp.h>
#define PAS_BACKEND_FILE_VERSION_NAME "PAS-DB-VERSION"
#define PAS_BACKEND_FILE_VERSION "0.1"
Index: addressbook/backend/pas/pas-backend-file.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/pas/pas-backend-file.h,v
retrieving revision 1.1
diff -u -r1.1 pas-backend-file.h
--- addressbook/backend/pas/pas-backend-file.h 2000/01/25 05:28:18 1.1
+++ addressbook/backend/pas/pas-backend-file.h 2000/04/20 00:08:59
@@ -6,7 +6,7 @@
#define __PAS_BACKEND_FILE_H__
#include <libgnome/gnome-defs.h>
-#include <pas-backend.h>
+#include "pas-backend.h"
typedef struct _PASBackendFilePrivate PASBackendFilePrivate;
Index: addressbook/backend/pas/pas-backend-ldap.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/pas/pas-backend-ldap.c,v
retrieving revision 1.9
diff -u -r1.9 pas-backend-ldap.c
--- addressbook/backend/pas/pas-backend-ldap.c 2000/04/15 00:14:40 1.9
+++ addressbook/backend/pas/pas-backend-ldap.c 2000/04/20 00:09:00
@@ -17,8 +17,8 @@
#include "pas-book.h"
#include "pas-card-cursor.h"
-#include <e-sexp.h>
-#include <e-card.h>
+#include <e-util/e-sexp.h>
+#include <ebook/e-card.h>
#define LDAP_MAX_SEARCH_RESPONSES 500
Index: addressbook/backend/pas/pas-backend-ldap.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/pas/pas-backend-ldap.h,v
retrieving revision 1.1
diff -u -r1.1 pas-backend-ldap.h
--- addressbook/backend/pas/pas-backend-ldap.h 2000/03/30 21:56:40 1.1
+++ addressbook/backend/pas/pas-backend-ldap.h 2000/04/20 00:09:00
@@ -6,7 +6,7 @@
#define __PAS_BACKEND_LDAP_H__
#include <libgnome/gnome-defs.h>
-#include <pas-backend.h>
+#include "pas-backend.h"
typedef struct _PASBackendLDAPPrivate PASBackendLDAPPrivate;
Index: addressbook/backend/pas/pas-backend.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/pas/pas-backend.c,v
retrieving revision 1.2
diff -u -r1.2 pas-backend.c
--- addressbook/backend/pas/pas-backend.c 2000/01/25 05:28:18 1.2
+++ addressbook/backend/pas/pas-backend.c 2000/04/20 00:09:03
@@ -5,8 +5,9 @@
* Copyright 2000, Helix Code, Inc.
*/
+#include <config.h>
#include <gtk/gtkobject.h>
-#include <pas-backend.h>
+#include "pas-backend.h"
#define CLASS(o) PAS_BACKEND_CLASS (GTK_OBJECT (o)->klass)
Index: addressbook/backend/pas/pas-backend.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/pas/pas-backend.h,v
retrieving revision 1.2
diff -u -r1.2 pas-backend.h
--- addressbook/backend/pas/pas-backend.h 2000/01/25 05:28:18 1.2
+++ addressbook/backend/pas/pas-backend.h 2000/04/20 00:09:03
@@ -23,12 +23,12 @@
#include <libgnome/gnome-defs.h>
#include <gtk/gtkobject.h>
-#include <addressbook.h>
+#include <pas/addressbook.h>
typedef struct _PASBackend PASBackend;
typedef struct _PASBackendPrivate PASBackendPrivate;
-#include <pas-book.h>
+#include <pas/pas-book.h>
struct _PASBackend {
GtkObject parent_object;
Index: addressbook/backend/pas/pas-book-factory.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/pas/pas-book-factory.c,v
retrieving revision 1.4
diff -u -r1.4 pas-book-factory.c
--- addressbook/backend/pas/pas-book-factory.c 2000/03/29 18:48:28 1.4
+++ addressbook/backend/pas/pas-book-factory.c 2000/04/20 00:09:03
@@ -6,10 +6,11 @@
* Copyright 2000, Helix Code, Inc.
*/
+#include <config.h>
#include <ctype.h>
#include <libgnorba/gnorba.h>
-#include <addressbook.h>
-#include <pas-book-factory.h>
+#include "addressbook.h"
+#include "pas-book-factory.h"
#define PAS_BOOK_FACTORY_GOAD_ID "evolution:addressbook-server"
Index: addressbook/backend/pas/pas-book-factory.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/pas/pas-book-factory.h,v
retrieving revision 1.3
diff -u -r1.3 pas-book-factory.h
--- addressbook/backend/pas/pas-book-factory.h 2000/03/21 03:00:38 1.3
+++ addressbook/backend/pas/pas-book-factory.h 2000/04/20 00:09:03
@@ -5,7 +5,7 @@
#include <bonobo/bonobo-object.h>
#include <libgnome/gnome-defs.h>
-#include <pas-backend.h>
+#include <pas/pas-backend.h>
#ifndef __PAS_BOOK_FACTORY_H__
#define __PAS_BOOK_FACTORY_H__
Index: addressbook/backend/pas/pas-book-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/pas/pas-book-view.c,v
retrieving revision 1.4
diff -u -r1.4 pas-book-view.c
--- addressbook/backend/pas/pas-book-view.c 2000/04/13 08:45:37 1.4
+++ addressbook/backend/pas/pas-book-view.c 2000/04/20 00:09:03
@@ -5,6 +5,7 @@
* Copyright 2000, Helix Code, Inc.
*/
+#include <config.h>
#include <glib.h>
#include "pas-book-view.h"
Index: addressbook/backend/pas/pas-book-view.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/pas/pas-book-view.h,v
retrieving revision 1.2
diff -u -r1.2 pas-book-view.h
--- addressbook/backend/pas/pas-book-view.h 2000/04/08 22:10:39 1.2
+++ addressbook/backend/pas/pas-book-view.h 2000/04/20 00:09:03
@@ -14,7 +14,7 @@
#include <bonobo/bonobo-object.h>
#include <libgnome/gnome-defs.h>
-#include <addressbook.h>
+#include <pas/addressbook.h>
typedef struct _PASBookView PASBookView;
typedef struct _PASBookViewClass PASBookViewClass;
Index: addressbook/backend/pas/pas-book.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/pas/pas-book.c,v
retrieving revision 1.5
diff -u -r1.5 pas-book.c
--- addressbook/backend/pas/pas-book.c 2000/04/03 15:03:56 1.5
+++ addressbook/backend/pas/pas-book.c 2000/04/20 00:09:03
@@ -5,8 +5,9 @@
* Copyright 2000, Helix Code, Inc.
*/
+#include <config.h>
#include <gtk/gtksignal.h>
-#include <pas-book.h>
+#include "pas-book.h"
static BonoboObjectClass *pas_book_parent_class;
POA_Evolution_Book__vepv pas_book_vepv;
Index: addressbook/backend/pas/pas-book.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/pas/pas-book.h,v
retrieving revision 1.4
diff -u -r1.4 pas-book.h
--- addressbook/backend/pas/pas-book.h 2000/04/03 15:03:56 1.4
+++ addressbook/backend/pas/pas-book.h 2000/04/20 00:09:03
@@ -14,8 +14,8 @@
#include <bonobo/bonobo-object.h>
#include <libgnome/gnome-defs.h>
-#include <addressbook.h>
-#include <pas-book-view.h>
+#include <pas/addressbook.h>
+#include <pas/pas-book-view.h>
typedef struct _PASBook PASBook;
typedef struct _PASBookPrivate PASBookPrivate;
Index: addressbook/backend/pas/pas-card-cursor.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/pas/pas-card-cursor.h,v
retrieving revision 1.1
diff -u -r1.1 pas-card-cursor.h
--- addressbook/backend/pas/pas-card-cursor.h 2000/03/28 03:52:46 1.1
+++ addressbook/backend/pas/pas-card-cursor.h 2000/04/20 00:09:03
@@ -12,7 +12,7 @@
#include <libgnome/gnome-defs.h>
#include <bonobo/bonobo-object.h>
-#include "addressbook.h"
+#include <pas/addressbook.h>
BEGIN_GNOME_DECLS
Index: addressbook/contact-editor/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/contact-editor/Makefile.am,v
retrieving revision 1.5
diff -u -r1.5 Makefile.am
--- addressbook/contact-editor/Makefile.am 2000/04/12 13:46:09 1.5
+++ addressbook/contact-editor/Makefile.am 2000/04/20 00:09:03
@@ -1,18 +1,20 @@
imagesdir = $(datadir)/images/evolution
-
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)
-CPPFLAGS = \
- -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
+CPPFLAGS = \
+ -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
-DDATADIR=\""$(datadir)"\"
INCLUDES = \
$(GNOME_INCLUDEDIR) \
- -I$(top_srcdir)/addressbook/backend/ebook \
- -DEVOLUTION_IMAGES=\""$(imagesdir)"\"
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/ \
+ -I$(top_srcdir)/addressbook/backend \
+ -DEVOLUTION_IMAGES=\""$(imagesdir)"\" \
+ -DG_LOG_DOMAIN=\"contact-editor\"
noinst_LIBRARIES = \
libecontacteditor.a
@@ -21,23 +23,22 @@
e-contact-editor.c \
e-contact-editor.h
-noinst_PROGRAMS = \
+noinst_PROGRAMS = \
contact-editor-test
contact_editor_test_SOURCES = \
test-editor.c
-contact_editor_test_LDADD = \
+contact_editor_test_LDADD = \
$(top_builddir)/addressbook/backend/ebook/libebook.la \
- $(top_builddir)/libversit/libversit.la \
- $(GNOMEGNORBA_LIBS) \
- -lbonobo \
- $(top_builddir)/e-util/libeutil.la \
- libecontacteditor.a \
+ $(top_builddir)/libversit/libversit.la \
+ $(GNOMEGNORBA_LIBS) \
+ -lbonobo \
+ $(top_builddir)/e-util/libeutil.la \
+ libecontacteditor.a \
$(EXTRA_GNOME_LIBS)
gladedir = $(datadir)/evolution/glade
glade_DATA = \
contact-editor.glade
-
Index: addressbook/contact-editor/e-contact-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/contact-editor/e-contact-editor.c,v
retrieving revision 1.13
diff -u -r1.13 e-contact-editor.c
--- addressbook/contact-editor/e-contact-editor.c 2000/04/16 21:06:02 1.13
+++ addressbook/contact-editor/e-contact-editor.c 2000/04/20 00:09:04
@@ -20,8 +20,10 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <gnome.h>
#include "e-contact-editor.h"
+
static void e_contact_editor_init (EContactEditor *card);
static void e_contact_editor_class_init (EContactEditorClass *klass);
static void e_contact_editor_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
Index: addressbook/contact-editor/e-contact-editor.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/contact-editor/e-contact-editor.h,v
retrieving revision 1.4
diff -u -r1.4 e-contact-editor.h
--- addressbook/contact-editor/e-contact-editor.h 2000/04/10 15:46:22 1.4
+++ addressbook/contact-editor/e-contact-editor.h 2000/04/20 00:09:04
@@ -23,7 +23,7 @@
#include <gnome.h>
#include <glade/glade.h>
-#include "e-card.h"
+#include <ebook/e-card.h>
#ifdef __cplusplus
extern "C" {
Index: addressbook/gui/component/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/Makefile.am,v
retrieving revision 1.2
diff -u -r1.2 Makefile.am
--- addressbook/gui/component/Makefile.am 2000/04/09 18:33:50 1.2
+++ addressbook/gui/component/Makefile.am 2000/04/20 00:09:05
@@ -1,12 +1,13 @@
-INCLUDES = \
- $(EXTRA_GNOME_CFLAGS) \
- $(GNOME_INCLUDEDIR) \
- -I$(top_srcdir)/widgets/e-text \
- -I$(top_srcdir)/e-util \
- -I$(top_srcdir) \
+INCLUDES = \
+ -DG_LOG_DOMAIN=\"evolution-addressbook\" \
+ $(EXTRA_GNOME_CFLAGS) \
+ $(GNOME_INCLUDEDIR) \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/widgets/e-text \
-I$(top_srcdir)/addressbook/gui/minicard \
-I$(top_srcdir)/addressbook/contact-editor \
- -I$(top_srcdir)/addressbook/backend/ebook \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
$(BONOBO_HTML_GNOME_CFLAGS) \
-DEVOLUTION_VERSION=\""$(VERSION)"\" \
-DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \
@@ -22,13 +23,13 @@
addressbook.c \
addressbook.h
-evolution_addressbook_LDADD = \
- $(EXTRA_GNOME_LIBS) \
- $(BONOBO_HTML_GNOME_LIBS) \
- $(top_builddir)/addressbook/gui/minicard/libeminicard.a \
- $(top_builddir)/widgets/e-text/libetext.a \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/addressbook/backend/ebook/libebook.la \
+evolution_addressbook_LDADD = \
+ $(EXTRA_GNOME_LIBS) \
+ $(BONOBO_HTML_GNOME_LIBS) \
+ $(top_builddir)/addressbook/gui/minicard/libeminicard.a \
+ $(top_builddir)/widgets/e-text/libetext.a \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/addressbook/backend/ebook/libebook.la \
$(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
$(top_builddir)/libversit/libversit.la
Index: addressbook/gui/component/addressbook.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/addressbook.c,v
retrieving revision 1.8
diff -u -r1.8 addressbook.c
--- addressbook/gui/component/addressbook.c 2000/04/15 21:51:58 1.8
+++ addressbook/gui/component/addressbook.c 2000/04/20 00:09:06
@@ -15,8 +15,8 @@
#include "addressbook.h"
-#include "e-book.h"
-#include "e-canvas.h"
+#include <ebook/e-book.h>
+#include <e-util/e-canvas.h>
#include "e-minicard-view.h"
#include "e-contact-editor.h"
Index: addressbook/gui/minicard/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/minicard/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- addressbook/gui/minicard/Makefile.am 2000/04/14 22:42:41 1.6
+++ addressbook/gui/minicard/Makefile.am 2000/04/20 00:09:06
@@ -1,15 +1,16 @@
-INCLUDES = \
- -I$(top_srcdir)/addressbook/backend/ebook \
+INCLUDES = \
+ -DG_LOG_DOMAIN=\"e-minicard\" \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/addressbook/backend \
+ -I$(top_builddir)/addressbook/backend \
-I$(top_srcdir)/addressbook/contact-editor \
- -I$(top_builddir)/addressbook/backend/ebook \
- -I$(top_srcdir)/widgets/e-text \
- -I$(top_srcdir)/e-util \
+ -I$(top_srcdir)/widgets/e-text \
$(GNOME_INCLUDEDIR)
noinst_LIBRARIES = \
libeminicard.a
-libeminicard_a_SOURCES = \
+libeminicard_a_SOURCES = \
e-minicard.c \
e-minicard.h \
e-minicard-label.c \
@@ -21,61 +22,61 @@
e-reflow.c \
e-reflow.h
-noinst_PROGRAMS = \
- minicard-label-test \
- minicard-test \
- reflow-test \
+noinst_PROGRAMS = \
+ minicard-label-test \
+ minicard-test \
+ reflow-test \
minicard-view-test
minicard_label_test_SOURCES = \
test-minicard-label.c
-minicard_label_test_LDADD = \
- $(EXTRA_GNOME_LIBS) \
+minicard_label_test_LDADD = \
+ $(EXTRA_GNOME_LIBS) \
$(GNOMEGNORBA_LIBS) \
- libeminicard.a \
+ libeminicard.a \
-lbonobo \
- $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/e-util/libeutil.la \
$(top_builddir)/widgets/e-text/libetext.a
minicard_test_SOURCES = \
test-minicard.c
-minicard_test_LDADD = \
- $(EXTRA_GNOME_LIBS) \
- $(GNOMEGNORBA_LIBS) \
- libeminicard.a \
- -lbonobo \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/addressbook/backend/ebook/libebook.la \
- $(top_builddir)/libversit/libversit.la \
+minicard_test_LDADD = \
+ $(EXTRA_GNOME_LIBS) \
+ $(GNOMEGNORBA_LIBS) \
+ libeminicard.a \
+ -lbonobo \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/addressbook/backend/ebook/libebook.la \
+ $(top_builddir)/libversit/libversit.la \
$(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
$(top_builddir)/widgets/e-text/libetext.a
reflow_test_SOURCES = \
test-reflow.c
-reflow_test_LDADD = \
- $(EXTRA_GNOME_LIBS) \
- $(GNOMEGNORBA_LIBS) \
- libeminicard.a \
- -lbonobo \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/addressbook/backend/ebook/libebook.la \
- $(top_builddir)/libversit/libversit.la \
+reflow_test_LDADD = \
+ $(EXTRA_GNOME_LIBS) \
+ $(GNOMEGNORBA_LIBS) \
+ libeminicard.a \
+ -lbonobo \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/addressbook/backend/ebook/libebook.la \
+ $(top_builddir)/libversit/libversit.la \
$(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
$(top_builddir)/widgets/e-text/libetext.a
minicard_view_test_SOURCES = \
test-minicard-view.c
-minicard_view_test_LDADD = \
- $(EXTRA_GNOME_LIBS) \
- $(GNOMEGNORBA_LIBS) \
- libeminicard.a \
- -lbonobo \
- $(top_builddir)/e-util/libeutil.la \
- $(top_builddir)/addressbook/backend/ebook/libebook.la \
- $(top_builddir)/libversit/libversit.la \
+minicard_view_test_LDADD = \
+ $(EXTRA_GNOME_LIBS) \
+ $(GNOMEGNORBA_LIBS) \
+ libeminicard.a \
+ -lbonobo \
+ $(top_builddir)/e-util/libeutil.la \
+ $(top_builddir)/addressbook/backend/ebook/libebook.la \
+ $(top_builddir)/libversit/libversit.la \
$(top_builddir)/addressbook/contact-editor/libecontacteditor.a \
$(top_builddir)/widgets/e-text/libetext.a
Index: addressbook/gui/minicard/e-minicard-label.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/minicard/e-minicard-label.c,v
retrieving revision 1.12
diff -u -r1.12 e-minicard-label.c
--- addressbook/gui/minicard/e-minicard-label.c 2000/03/12 07:59:41 1.12
+++ addressbook/gui/minicard/e-minicard-label.c 2000/04/20 00:09:06
@@ -20,12 +20,14 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <gnome.h>
#include "e-minicard-label.h"
#include "e-text.h"
-#include "e-canvas.h"
-#include "e-util.h"
-#include "e-canvas-utils.h"
+#include <e-util/e-canvas.h>
+#include <e-util/e-util.h>
+#include <e-util/e-canvas-utils.h>
+
static void e_minicard_label_init (EMinicardLabel *card);
static void e_minicard_label_class_init (EMinicardLabelClass *klass);
static void e_minicard_label_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
Index: addressbook/gui/minicard/e-minicard-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/minicard/e-minicard-view.c,v
retrieving revision 1.8
diff -u -r1.8 e-minicard-view.c
--- addressbook/gui/minicard/e-minicard-view.c 2000/04/16 11:36:03 1.8
+++ addressbook/gui/minicard/e-minicard-view.c 2000/04/20 00:09:06
@@ -22,7 +22,7 @@
#include <config.h>
#include <gnome.h>
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
#include "e-minicard-view.h"
#include "e-minicard.h"
static void e_minicard_view_init (EMinicardView *reflow);
Index: addressbook/gui/minicard/e-minicard-view.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/minicard/e-minicard-view.h,v
retrieving revision 1.3
diff -u -r1.3 e-minicard-view.h
--- addressbook/gui/minicard/e-minicard-view.h 2000/04/11 00:21:08 1.3
+++ addressbook/gui/minicard/e-minicard-view.h 2000/04/20 00:09:07
@@ -23,7 +23,7 @@
#include <gnome.h>
#include "e-reflow-sorted.h"
-#include "e-book.h"
+#include <ebook/e-book.h>
#ifdef __cplusplus
extern "C" {
Index: addressbook/gui/minicard/e-minicard.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/minicard/e-minicard.c,v
retrieving revision 1.17
diff -u -r1.17 e-minicard.c
--- addressbook/gui/minicard/e-minicard.c 2000/04/16 11:36:03 1.17
+++ addressbook/gui/minicard/e-minicard.c 2000/04/20 00:09:08
@@ -20,16 +20,18 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <gnome.h>
#include "e-minicard.h"
#include "e-minicard-label.h"
#include "e-text.h"
-#include "e-book.h"
-#include "e-canvas.h"
-#include "e-util.h"
-#include "e-canvas-utils.h"
+#include <ebook/e-book.h>
+#include <e-util/e-canvas.h>
+#include <e-util/e-util.h>
+#include <e-util/e-canvas-utils.h>
#include "e-contact-editor.h"
#include "e-minicard-view.h"
+
static void e_minicard_init (EMinicard *card);
static void e_minicard_class_init (EMinicardClass *klass);
static void e_minicard_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
Index: addressbook/gui/minicard/e-minicard.h
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/minicard/e-minicard.h,v
retrieving revision 1.6
diff -u -r1.6 e-minicard.h
--- addressbook/gui/minicard/e-minicard.h 2000/04/08 22:18:23 1.6
+++ addressbook/gui/minicard/e-minicard.h 2000/04/20 00:09:08
@@ -22,7 +22,7 @@
#define __E_MINICARD_H__
#include <gnome.h>
-#include "e-card.h"
+#include <ebook/e-card.h>
#ifdef __cplusplus
extern "C" {
Index: addressbook/gui/minicard/e-reflow-sorted.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/minicard/e-reflow-sorted.c,v
retrieving revision 1.1
diff -u -r1.1 e-reflow-sorted.c
--- addressbook/gui/minicard/e-reflow-sorted.c 2000/04/08 22:18:23 1.1
+++ addressbook/gui/minicard/e-reflow-sorted.c 2000/04/20 00:09:08
@@ -20,13 +20,14 @@
* Boston, MA 02111-1307, USA.
*/
-#include <gnome.h>
+#include <config.h>
#include <math.h>
+#include <gnome.h>
#include "e-reflow-sorted.h"
-#include "e-canvas-utils.h"
-#include "e-canvas.h"
-#include "e-util.h"
-#include <glib.h>
+#include <e-util/e-canvas-utils.h>
+#include <e-util/e-canvas.h>
+#include <e-util/e-util.h>
+
static void e_reflow_sorted_init (EReflowSorted *card);
static void e_reflow_sorted_class_init (EReflowSortedClass *klass);
static void e_reflow_sorted_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
Index: addressbook/gui/minicard/e-reflow.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/minicard/e-reflow.c,v
retrieving revision 1.10
diff -u -r1.10 e-reflow.c
--- addressbook/gui/minicard/e-reflow.c 2000/04/11 00:21:08 1.10
+++ addressbook/gui/minicard/e-reflow.c 2000/04/20 00:09:09
@@ -20,12 +20,14 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include <gnome.h>
#include <math.h>
#include "e-reflow.h"
-#include "e-canvas-utils.h"
-#include "e-canvas.h"
-#include "e-util.h"
+#include <e-util/e-canvas-utils.h>
+#include <e-util/e-canvas.h>
+#include <e-util/e-util.h>
+
static void e_reflow_init (EReflow *reflow);
static void e_reflow_class_init (EReflowClass *klass);
static void e_reflow_set_arg (GtkObject *o, GtkArg *arg, guint arg_id);
Index: addressbook/gui/minicard/test-minicard-label.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/minicard/test-minicard-label.c,v
retrieving revision 1.3
diff -u -r1.3 test-minicard-label.c
--- addressbook/gui/minicard/test-minicard-label.c 2000/03/12 07:59:41 1.3
+++ addressbook/gui/minicard/test-minicard-label.c 2000/04/20 00:09:09
@@ -21,7 +21,7 @@
#include <gnome.h>
#include "e-minicard-label.h"
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
/* This is a horrible thing to do, but it is just a test. */
GnomeCanvasItem *label;
Index: addressbook/gui/minicard/test-minicard-view.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/minicard/test-minicard-view.c,v
retrieving revision 1.1
diff -u -r1.1 test-minicard-view.c
--- addressbook/gui/minicard/test-minicard-view.c 2000/04/08 22:18:23 1.1
+++ addressbook/gui/minicard/test-minicard-view.c 2000/04/20 00:09:10
@@ -20,7 +20,7 @@
#include <gnome.h>
#include <libgnorba/gnorba.h>
#include <bonobo.h>
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
#include "e-minicard-view.h"
/* This is a horrible thing to do, but it is just a test. */
Index: addressbook/gui/minicard/test-reflow.c
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/minicard/test-reflow.c,v
retrieving revision 1.8
diff -u -r1.8 test-reflow.c
--- addressbook/gui/minicard/test-reflow.c 2000/04/13 07:50:07 1.8
+++ addressbook/gui/minicard/test-reflow.c 2000/04/20 00:09:10
@@ -35,7 +35,7 @@
#include "config.h"
#include <gnome.h>
-#include "e-canvas.h"
+#include <e-util/e-canvas.h>
#include "e-reflow.h"
#include "e-minicard.h"
Index: libical/src/test/Makefile.in
===================================================================
RCS file: /cvs/gnome/libical/src/test/Makefile.in,v
retrieving revision 1.4
diff -u -r1.4 Makefile.in
--- libical/src/test/Makefile.in 2000/04/19 14:34:07 1.4
+++ libical/src/test/Makefile.in 2000/04/20 00:09:13
@@ -255,7 +255,7 @@
@for file in $(DISTFILES); do \
d=$(srcdir); \
if test -d $$d/$$file; then \
- cp -pr $$/$$file $(distdir)/$$file; \
+ cp -pr $$d/$$file $(distdir)/$$file; \
else \
test -f $(distdir)/$$file \
|| ln $$d/$$file $(distdir)/$$file 2> /dev/null \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
