summaryrefslogtreecommitdiff
path: root/libedataserver
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2003-11-25 22:29:37 +0000
committerChris Toshok <toshok@src.gnome.org>2003-11-25 22:29:37 +0000
commit8641831a507194e39d5246f4ac9ffd750b20c8f9 (patch)
treeb86e701ce18aa35f6968263cdab59d0fd739e464 /libedataserver
parentc08698119e3dad4467cc5edbe14ee99bdea9e9c8 (diff)
downloadevolution-data-server-8641831a507194e39d5246f4ac9ffd750b20c8f9.tar.gz
use the embedded db4. (libedataserver_la_LIBADD): explicitly list the db4
2003-11-25 Chris Toshok <toshok@ximian.com> * libedataserver/Makefile.am (INCLUDES): use the embedded db4. (libedataserver_la_LIBADD): explicitly list the db4 .a since I suck at getting libtool to do what I want. * libdb/dist/Makefile.in (install-strip install): don't do anything here. * Makefile.am (SUBDIRS): add libdb (DIST_SUBDIRS): new variable, list everything in SUBDIRS except libdb. (LIBDB_FILES): list all the db4 files. (EXTRA_DIST): add the db4 files explicitly to this. * configure.in: remove all the db3 stuff, and build the embedded db4.
Diffstat (limited to 'libedataserver')
-rw-r--r--libedataserver/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/libedataserver/Makefile.am b/libedataserver/Makefile.am
index 4afbd37cc..c8ef0adc3 100644
--- a/libedataserver/Makefile.am
+++ b/libedataserver/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = \
-I$(top_srcdir) \
-DG_LOG_DOMAIN=\"e-data-server\" \
-DG_DISABLE_DEPRECATED \
- $(DB3_CFLAGS) \
+ -I$(top_srcdir)/libdb/dist \
$(E_DATA_SERVER_CFLAGS)
# The marshallers
@@ -34,7 +34,7 @@ libedataserver_la_SOURCES = \
md5-utils.c
libedataserver_la_LIBADD = \
- $(DB3_LDADD)
+ $(top_builddir)/libdb/dist/.libs/libdb-4.1.a
libedataserver_la_LDFLAGS = \
-version-info $(LIBEDATASERVER_CURRENT):$(LIBEDATASERVER_REVISION):$(LIBEDATASERVER_AGE)