Mercurial > dovecot > core-2.2

changeset 6863:63dd68ae343f HEAD

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Create a separate libdict_backend.a library with sql/db backends and link it only to dict server. This fixes linking issues with linkers that didn't automatically drop the unused sql/db code.
author Timo Sirainen <tss@iki.fi>
date Tue, 27 Nov 2007 05:27:31 +0200
parents ff884d70197b
children 6d271590e0e9
files src/dict/Makefile.am src/lib-dict/Makefile.am
diffstat 2 files changed, 11 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/src/dict/Makefile.am	Mon Nov 26 20:19:19 2007 +0200
+++ b/src/dict/Makefile.am	Tue Nov 27 05:27:31 2007 +0200
@@ -12,6 +12,7 @@
 dict_LDFLAGS = -export-dynamic
 
 libs = \
+	../lib-dict/libdict_backend.a \
 	../lib-dict/libdict.a \
 	../lib-sql/libsql.a \
 	../lib/liblib.a
--- a/src/lib-dict/Makefile.am	Mon Nov 26 20:19:19 2007 +0200
+++ b/src/lib-dict/Makefile.am	Tue Nov 27 05:27:31 2007 +0200
@@ -1,4 +1,4 @@
-noinst_LIBRARIES = libdict.a
+noinst_LIBRARIES = libdict.a libdict_backend.a
 
 dict_drivers = @dict_drivers@
 
@@ -8,14 +8,19 @@
 	-DPKG_RUNDIR=\""$(rundir)"\" \
 	$(SQL_CFLAGS)
 
-dist_sources = \
+base_sources = \
 	dict.c \
-	dict-client.c \
+	dict-client.c
+
+backend_sources = \
 	dict-db.c \
 	dict-sql.c
 
 libdict_a_SOURCES = \
-	$(dist_sources) \
+	$(base_sources)
+
+libdict_backend_a_SOURCES = \
+	$(backend_sources) \
 	dict-drivers-register.c
 
 headers = \
@@ -59,7 +64,7 @@
 	done
 	echo '}' >>$@
 
-DISTFILES = $(DIST_COMMON) $(dist_sources) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+DISTFILES = $(DIST_COMMON) $(base_sources) $(backend_sources) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
 
 distclean-generic:
 	rm -f Makefile dict-drivers-register.c