aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/backend/pas
diff options
context:
space:
mode:
Diffstat (limited to 'addressbook/backend/pas')
-rw-r--r--addressbook/backend/pas/Makefile.am41
-rw-r--r--addressbook/backend/pas/pas-backend-file.c10
-rw-r--r--addressbook/backend/pas/pas-backend-file.h2
-rw-r--r--addressbook/backend/pas/pas-backend-ldap.c4
-rw-r--r--addressbook/backend/pas/pas-backend-ldap.h2
-rw-r--r--addressbook/backend/pas/pas-backend.c3
-rw-r--r--addressbook/backend/pas/pas-backend.h4
-rw-r--r--addressbook/backend/pas/pas-book-factory.c5
-rw-r--r--addressbook/backend/pas/pas-book-factory.h2
-rw-r--r--addressbook/backend/pas/pas-book-view.c1
-rw-r--r--addressbook/backend/pas/pas-book-view.h2
-rw-r--r--addressbook/backend/pas/pas-book.c3
-rw-r--r--addressbook/backend/pas/pas-book.h8
-rw-r--r--addressbook/backend/pas/pas-card-cursor.h2
14 files changed, 38 insertions, 51 deletions
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
index c5f8ed302a..44cb5a66a1 100644
--- a/addressbook/backend/pas/Makefile.am
+++ b/addressbook/backend/pas/Makefile.am
@@ -1,7 +1,3 @@
-lib_LTLIBRARIES = libpas.la
-
-corbadir = $(sysconfdir)/CORBA/servers
-
CORBA_SOURCE = \
addressbook.h \
addressbook-common.c \
@@ -18,45 +14,32 @@ $(CORBA_SOURCE): $(idls)
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
-libpas_la_SOURCES = \
+noinst_LIBRARIES = libpas.a
+
+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)
diff --git a/addressbook/backend/pas/pas-backend-file.c b/addressbook/backend/pas/pas-backend-file.c
index 02ad7866b2..a1435f9251 100644
--- a/addressbook/backend/pas/pas-backend-file.c
+++ b/addressbook/backend/pas/pas-backend-file.c
@@ -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"
diff --git a/addressbook/backend/pas/pas-backend-file.h b/addressbook/backend/pas/pas-backend-file.h
index a56626014b..4da9a29cc5 100644
--- a/addressbook/backend/pas/pas-backend-file.h
+++ b/addressbook/backend/pas/pas-backend-file.h
@@ -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;
diff --git a/addressbook/backend/pas/pas-backend-ldap.c b/addressbook/backend/pas/pas-backend-ldap.c
index 9b98a0ce1f..95d80d898d 100644
--- a/addressbook/backend/pas/pas-backend-ldap.c
+++ b/addressbook/backend/pas/pas-backend-ldap.c
@@ -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
diff --git a/addressbook/backend/pas/pas-backend-ldap.h b/addressbook/backend/pas/pas-backend-ldap.h
index fa6d2295d8..a59cdf3857 100644
--- a/addressbook/backend/pas/pas-backend-ldap.h
+++ b/addressbook/backend/pas/pas-backend-ldap.h
@@ -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;
diff --git a/addressbook/backend/pas/pas-backend.c b/addressbook/backend/pas/pas-backend.c
index 364204c3c2..d8aa23fb37 100644
--- a/addressbook/backend/pas/pas-backend.c
+++ b/addressbook/backend/pas/pas-backend.c
@@ -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)
diff --git a/addressbook/backend/pas/pas-backend.h b/addressbook/backend/pas/pas-backend.h
index 62822619ac..46cce03e03 100644
--- a/addressbook/backend/pas/pas-backend.h
+++ b/addressbook/backend/pas/pas-backend.h
@@ -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;
diff --git a/addressbook/backend/pas/pas-book-factory.c b/addressbook/backend/pas/pas-book-factory.c
index 576b28b0f5..6542ffc48b 100644
--- a/addressbook/backend/pas/pas-book-factory.c
+++ b/addressbook/backend/pas/pas-book-factory.c
@@ -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"
diff --git a/addressbook/backend/pas/pas-book-factory.h b/addressbook/backend/pas/pas-book-factory.h
index cd99ae0825..c9607298f5 100644
--- a/addressbook/backend/pas/pas-book-factory.h
+++ b/addressbook/backend/pas/pas-book-factory.h
@@ -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__
diff --git a/addressbook/backend/pas/pas-book-view.c b/addressbook/backend/pas/pas-book-view.c
index 9754fb5692..d218112555 100644
--- a/addressbook/backend/pas/pas-book-view.c
+++ b/addressbook/backend/pas/pas-book-view.c
@@ -5,6 +5,7 @@
* Copyright 2000, Helix Code, Inc.
*/
+#include <config.h>
#include <glib.h>
#include "pas-book-view.h"
diff --git a/addressbook/backend/pas/pas-book-view.h b/addressbook/backend/pas/pas-book-view.h
index 9644c79de1..55023b48ed 100644
--- a/addressbook/backend/pas/pas-book-view.h
+++ b/addressbook/backend/pas/pas-book-view.h
@@ -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;
diff --git a/addressbook/backend/pas/pas-book.c b/addressbook/backend/pas/pas-book.c
index 47e5508654..8aea0197cc 100644
--- a/addressbook/backend/pas/pas-book.c
+++ b/addressbook/backend/pas/pas-book.c
@@ -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;
diff --git a/addressbook/backend/pas/pas-book.h b/addressbook/backend/pas/pas-book.h
index 8d92f6a266..094df79857 100644
--- a/addressbook/backend/pas/pas-book.h
+++ b/addressbook/backend/pas/pas-book.h
@@ -14,14 +14,14 @@
#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;
-#include <pas-backend.h>
-#include <pas-card-cursor.h>
+#include <pas/pas-backend.h>
+#include <pas/pas-card-cursor.h>
typedef enum {
CreateCard,
diff --git a/addressbook/backend/pas/pas-card-cursor.h b/addressbook/backend/pas/pas-card-cursor.h
index a829d2c838..300e3e3ce1 100644
--- a/addressbook/backend/pas/pas-card-cursor.h
+++ b/addressbook/backend/pas/pas-card-cursor.h
@@ -12,7 +12,7 @@
#include <libgnome/gnome-defs.h>
#include <bonobo/bonobo-object.h>
-#include "addressbook.h"
+#include <pas/addressbook.h>
BEGIN_GNOME_DECLS