aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Winship <danw@src.gnome.org>2002-07-23 02:21:21 +0800
committerDan Winship <danw@src.gnome.org>2002-07-23 02:21:21 +0800
commit4e8818d32013f64366b9e143c2507be64c931101 (patch)
treeae848ac16e5895b273e88d2a34dd10a10f45eee4
parent88737bd9defc5c6983c30963753146496218e86d (diff)
downloadgsoc2013-evolution-4e8818d32013f64366b9e143c2507be64c931101.tar
gsoc2013-evolution-4e8818d32013f64366b9e143c2507be64c931101.tar.gz
gsoc2013-evolution-4e8818d32013f64366b9e143c2507be64c931101.tar.bz2
gsoc2013-evolution-4e8818d32013f64366b9e143c2507be64c931101.tar.lz
gsoc2013-evolution-4e8818d32013f64366b9e143c2507be64c931101.tar.xz
gsoc2013-evolution-4e8818d32013f64366b9e143c2507be64c931101.tar.zst
gsoc2013-evolution-4e8818d32013f64366b9e143c2507be64c931101.zip
Split pas-backend-file and pas-backend-ldap out of libpas and build them
* backend/pas/Makefile.am: Split pas-backend-file and pas-backend-ldap out of libpas and build them as separate (noinst) libraries libpasfile.a and libpasldap.a. This gets the db3 and LDAP dependencies out of libpas, and people trying to create an addressbook backend shouldn't be calling functions from the existing backends anyway so there's no reason to install them. svn path=/trunk/; revision=17528
-rw-r--r--addressbook/ChangeLog9
-rw-r--r--addressbook/backend/pas/Makefile.am26
2 files changed, 24 insertions, 11 deletions
diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index 6d3cba4f69..56d7c6ae5f 100644
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,3 +1,12 @@
+2002-07-22 Dan Winship <danw@ximian.com>
+
+ * backend/pas/Makefile.am: Split pas-backend-file and
+ pas-backend-ldap out of libpas and build them as separate (noinst)
+ libraries libpasfile.a and libpasldap.a. This gets the db3 and
+ LDAP dependencies out of libpas, and people trying to create an
+ addressbook backend shouldn't be calling functions from the
+ existing backends anyway so there's no reason to install them.
+
2002-07-16 Chris Toshok <toshok@ximian.com>
* gui/component/select-names/select-names.glade: remove the option
diff --git a/addressbook/backend/pas/Makefile.am b/addressbook/backend/pas/Makefile.am
index 7cdea8dac5..28e29de9d7 100644
--- a/addressbook/backend/pas/Makefile.am
+++ b/addressbook/backend/pas/Makefile.am
@@ -28,18 +28,16 @@ INCLUDES = \
LDAP_SCHEMA = \
evolutionperson.schema
-LDAP_BACKEND_FILES_C = pas-backend-ldap.c
-LDAP_BACKEND_FILES_H = pas-backend-ldap.h
+LDAP_BACKEND_FILES = \
+ pas-backend-ldap.c \
+ pas-backend-ldap.h
if ENABLE_LDAP
-LDAP_BACKEND_C = $(LDAP_BACKEND_FILES_C)
-LDAP_BACKEND_H = $(LDAP_BACKEND_FILES_H)
-else
-LDAP_BACKEND_C =
-LDAP_BACKEND_H =
+LDAP_BACKEND = libpasldap.a
endif
privlib_LIBRARIES = libpas.a
+noinst_LIBRARIES = libpasfile.a $(LDAP_BACKEND)
pasincludedir = $(includedir)/evolution/pas
@@ -49,8 +47,6 @@ pasinclude_HEADERS = \
pas-book-view.h \
pas-book.h \
pas-backend-card-sexp.h \
- pas-backend-file.h \
- $(LDAP_BACKEND_H) \
pas-backend.h \
pas-backend-summary.h \
pas-card-cursor.h
@@ -63,15 +59,23 @@ libpas_a_SOURCES = \
pas-book.c \
pas-backend-card-sexp.c \
pas-backend-file.c \
- $(LDAP_BACKEND_C) \
pas-backend.c \
pas-backend-summary.c \
pas-card-cursor.c
+libpasfile_a_SOURCES = \
+ pas-backend-file.c \
+ pas-backend-file.h
+
+if ENABLE_LDAP
+libpasldap_a_SOURCES = \
+ $(LDAP_BACKEND_FILES)
+endif
+
BUILT_SOURCES = $(CORBA_SOURCE)
CLEANFILES = $(BUILT_SOURCES)
dist-hook:
cd $(distdir); rm -f $(BUILT_SOURCES)
-EXTRA_DIST = $(LDAP_BACKEND_FILES_C) $(LDAP_BACKEND_FILES_H) $(LDAP_SCHEMA)
+EXTRA_DIST = $(LDAP_BACKEND_FILES) $(LDAP_SCHEMA)