1 diff -urN evolution-data-server-1.3.8.orig/addressbook/backends/file/Makefile.am evolution-data-server-1.3.8/addressbook/backends/file/Makefile.am
2 --- evolution-data-server-1.3.8.orig/addressbook/backends/file/Makefile.am 2005-08-23 11:04:40.302083616 +0200
3 +++ evolution-data-server-1.3.8/addressbook/backends/file/Makefile.am 2005-08-23 11:05:46.385037480 +0200
6 -I$(top_srcdir)/addressbook \
7 -I$(top_builddir)/addressbook \
8 - -I$(top_srcdir)/libdb/dist \
9 $(EVOLUTION_ADDRESSBOOK_CFLAGS)
11 extension_LTLIBRARIES = libebookbackendfile.la
13 $(top_builddir)/addressbook/libebook/libebook-1.2.la \
14 $(top_builddir)/addressbook/libedata-book/libedata-book-1.2.la \
15 $(top_builddir)/libedataserver/libedataserver-1.2.la \
16 - $(top_builddir)/libdb/dist/libdb-4.1.la \
17 - $(EVOLUTION_ADDRESSBOOK_LIBS)
18 + $(EVOLUTION_ADDRESSBOOK_LIBS) \
21 libebookbackendfile_la_LDFLAGS = \
22 -module -avoid-version $(NO_UNDEFINED)
23 diff -urN evolution-data-server-1.3.8.orig/configure.in evolution-data-server-1.3.8/configure.in
24 --- evolution-data-server-1.3.8.orig/configure.in 2005-08-23 11:04:38.291389288 +0200
25 +++ evolution-data-server-1.3.8/configure.in 2005-08-23 11:05:46.387037176 +0200
29 AC_CONFIG_SUBDIRS(calendar/libical)
30 -AC_CONFIG_SUBDIRS(libdb/dist)
35 camel/tests/stream/Makefile
37 camel/camel-provider.pc
39 libedataserver/Makefile
40 libedataserver/libedataserver.pc
41 libedataserverui/Makefile
42 diff -urN evolution-data-server-1.3.8.orig/libedataserver/Makefile.am evolution-data-server-1.3.8/libedataserver/Makefile.am
43 --- evolution-data-server-1.3.8.orig/libedataserver/Makefile.am 2005-08-23 11:04:40.526049568 +0200
44 +++ evolution-data-server-1.3.8/libedataserver/Makefile.am 2005-08-23 11:06:56.983304912 +0200
48 -DG_LOG_DOMAIN=\"e-data-server\" \
49 - -I$(top_srcdir)/libdb/dist \
50 -DE_DATA_SERVER_EXTENSIONDIR=\"$(extensiondir)\" \
51 -DE_DATA_SERVER_IMAGESDIR=\"$(imagesdir)\" \
52 $(E_DATA_SERVER_CFLAGS)
54 libedataserver_1_2_la_LIBADD = \
55 $(E_DATA_SERVER_LIBS) \
57 - $(top_builddir)/libdb/dist/libdb-4.1.la \
61 libedataserver_1_2_la_LDFLAGS = \
62 diff -urN evolution-data-server-1.3.8.orig/Makefile.am evolution-data-server-1.3.8/Makefile.am
63 --- evolution-data-server-1.3.8.orig/Makefile.am 2005-08-23 11:04:40.203098664 +0200
64 +++ evolution-data-server-1.3.8/Makefile.am 2005-08-23 11:05:46.390036720 +0200
66 AUTOMAKE_OPTIONS = 1.6
67 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
69 -SUBDIRS = libdb libedataserver servers camel addressbook calendar libedataserverui src docs art po
70 +SUBDIRS = libedataserver servers camel addressbook calendar libedataserverui src docs art po
71 DIST_SUBDIRS= libedataserver servers camel addressbook calendar libedataserverui src docs art po
78 - $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in) \
80 + $(pkgconfig_DATA:-$(API_VERSION).pc=.pc.in)
82 +# files below should be removed due to system db patch, but they are left,
84 DISTCLEANFILES = intltool-extract intltool-merge intltool-update iconv-detect.h $(pkgconfig_DATA)
86 (cd libdb && $(MAKE) $(AM_MAKEFLAGS) distclean)