From a2c51b310b3abf2b73c83cbfc928193cf153a3fb Mon Sep 17 00:00:00 2001
From: Stephan Bosch <stephan@rename-it.nl>
Date: Thu, 22 Nov 2007 16:57:48 +0100
Subject: [PATCH] Cleaned up make process and included the 'plugins' into the
main sieve library archive.
---
src/lib-sieve/Makefile.am | 15 +++++++++++++--
src/lib-sieve/plugins/Makefile.am | 1 +
.../comparator-i-ascii-numeric/Makefile.am | 4 ++--
src/lib-sieve/plugins/regex/Makefile.am | 4 ++--
src/lib-sieve/plugins/relational/Makefile.am | 4 ++--
src/lib-sieve/plugins/subaddress/Makefile.am | 4 ++--
src/lib-sieve/plugins/vacation/Makefile.am | 4 ++--
src/sieve-bin/Makefile.am | 14 +-------------
8 files changed, 25 insertions(+), 25 deletions(-)
diff --git a/src/lib-sieve/Makefile.am b/src/lib-sieve/Makefile.am
index d9b22f56a..43eff4267 100644
--- a/src/lib-sieve/Makefile.am
+++ b/src/lib-sieve/Makefile.am
@@ -1,6 +1,6 @@
SUBDIRS = plugins
-noinst_LIBRARIES = libsieve.a
+noinst_LTLIBRARIES = libsieve.la
AM_CPPFLAGS = \
-I$(dovecot_incdir) \
@@ -27,7 +27,18 @@ exts = \
ext-reject.c \
ext-envelope.c
-libsieve_a_SOURCES = \
+# These are not actual plugins just yet...
+plugins = \
+ ./plugins/vacation/libsieve_ext_vacation.la \
+ ./plugins/subaddress/libsieve_ext_subaddress.la \
+ ./plugins/comparator-i-ascii-numeric/libsieve_ext_comparator-i-ascii-numeric.la \
+ ./plugins/relational/libsieve_ext_relational.la \
+ ./plugins/regex/libsieve_ext_regex.la
+
+libsieve_la_DEPENDENCIES = $(plugins)
+libsieve_la_LIBADD = $(plugins)
+
+libsieve_la_SOURCES = \
sieve-lexer.c \
sieve-ast.c \
sieve-binary.c \
diff --git a/src/lib-sieve/plugins/Makefile.am b/src/lib-sieve/plugins/Makefile.am
index 020741cea..bbfa08ccd 100644
--- a/src/lib-sieve/plugins/Makefile.am
+++ b/src/lib-sieve/plugins/Makefile.am
@@ -1 +1,2 @@
SUBDIRS = vacation subaddress comparator-i-ascii-numeric relational regex
+
diff --git a/src/lib-sieve/plugins/comparator-i-ascii-numeric/Makefile.am b/src/lib-sieve/plugins/comparator-i-ascii-numeric/Makefile.am
index 56b6e3145..ca0d8abf3 100644
--- a/src/lib-sieve/plugins/comparator-i-ascii-numeric/Makefile.am
+++ b/src/lib-sieve/plugins/comparator-i-ascii-numeric/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LIBRARIES = lib_ext_comparator-i-ascii-numeric.a
+noinst_LTLIBRARIES = libsieve_ext_comparator-i-ascii-numeric.la
AM_CPPFLAGS = \
-I../../ \
@@ -7,6 +7,6 @@ AM_CPPFLAGS = \
-I$(dovecot_incdir)/src/lib-mail \
-I$(dovecot_incdir)/src/lib-storage
-lib_ext_comparator_i_ascii_numeric_a_SOURCES = \
+libsieve_ext_comparator_i_ascii_numeric_la_SOURCES = \
ext-cmp-i-ascii-numeric.c
diff --git a/src/lib-sieve/plugins/regex/Makefile.am b/src/lib-sieve/plugins/regex/Makefile.am
index a60a112a8..3b4444768 100644
--- a/src/lib-sieve/plugins/regex/Makefile.am
+++ b/src/lib-sieve/plugins/regex/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LIBRARIES = lib_ext_regex.a
+noinst_LTLIBRARIES = libsieve_ext_regex.la
AM_CPPFLAGS = \
-I../../ \
@@ -7,6 +7,6 @@ AM_CPPFLAGS = \
-I$(dovecot_incdir)/src/lib-mail \
-I$(dovecot_incdir)/src/lib-storage
-lib_ext_regex_a_SOURCES = \
+libsieve_ext_regex_la_SOURCES = \
ext-regex.c
diff --git a/src/lib-sieve/plugins/relational/Makefile.am b/src/lib-sieve/plugins/relational/Makefile.am
index 35db8634f..a883602c2 100644
--- a/src/lib-sieve/plugins/relational/Makefile.am
+++ b/src/lib-sieve/plugins/relational/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LIBRARIES = lib_ext_relational.a
+noinst_LTLIBRARIES = libsieve_ext_relational.la
AM_CPPFLAGS = \
-I../../ \
@@ -7,6 +7,6 @@ AM_CPPFLAGS = \
-I$(dovecot_incdir)/src/lib-mail \
-I$(dovecot_incdir)/src/lib-storage
-lib_ext_relational_a_SOURCES = \
+libsieve_ext_relational_la_SOURCES = \
ext-relational.c
diff --git a/src/lib-sieve/plugins/subaddress/Makefile.am b/src/lib-sieve/plugins/subaddress/Makefile.am
index befb510b6..02777f61e 100644
--- a/src/lib-sieve/plugins/subaddress/Makefile.am
+++ b/src/lib-sieve/plugins/subaddress/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LIBRARIES = lib_ext_subaddress.a
+noinst_LTLIBRARIES = libsieve_ext_subaddress.la
AM_CPPFLAGS = \
-I../../ \
@@ -7,6 +7,6 @@ AM_CPPFLAGS = \
-I$(dovecot_incdir)/src/lib-mail \
-I$(dovecot_incdir)/src/lib-storage
-lib_ext_subaddress_a_SOURCES = \
+libsieve_ext_subaddress_la_SOURCES = \
ext-subaddress.c
diff --git a/src/lib-sieve/plugins/vacation/Makefile.am b/src/lib-sieve/plugins/vacation/Makefile.am
index 8a0595608..3bd21db0e 100644
--- a/src/lib-sieve/plugins/vacation/Makefile.am
+++ b/src/lib-sieve/plugins/vacation/Makefile.am
@@ -1,4 +1,4 @@
-noinst_LIBRARIES = lib_ext_vacation.a
+noinst_LTLIBRARIES = libsieve_ext_vacation.la
AM_CPPFLAGS = \
-I../../ \
@@ -7,6 +7,6 @@ AM_CPPFLAGS = \
-I$(dovecot_incdir)/src/lib-mail \
-I$(dovecot_incdir)/src/lib-storage
-lib_ext_vacation_a_SOURCES = \
+libsieve_ext_vacation_la_SOURCES = \
ext-vacation.c
diff --git a/src/sieve-bin/Makefile.am b/src/sieve-bin/Makefile.am
index 6f86fd3df..df92ad182 100644
--- a/src/sieve-bin/Makefile.am
+++ b/src/sieve-bin/Makefile.am
@@ -10,22 +10,11 @@ AM_CPPFLAGS = \
-I$(dovecot_incdir)/src/lib-storage/index \
-I$(dovecot_incdir)/src/lib-storage/index/raw
-plugin_dir = \
- $(top_srcdir)/src/lib-sieve/plugins
-
-# These are not actual plugins just yet...
-plugins = \
- $(plugin_dir)/vacation/lib_ext_vacation.a \
- $(plugin_dir)/subaddress/lib_ext_subaddress.a \
- $(plugin_dir)/comparator-i-ascii-numeric/lib_ext_comparator-i-ascii-numeric.a \
- $(plugin_dir)/relational/lib_ext_relational.a \
- $(plugin_dir)/regex/lib_ext_regex.a
-
sievec_LDFLAGS = -export-dynamic -Wl,--start-group
sieve_test_LDFLAGS = -export-dynamic -Wl,--start-group
libs = \
- $(top_srcdir)/src/lib-sieve/libsieve.a \
+ $(top_srcdir)/src/lib-sieve/libsieve.la \
$(dovecot_incdir)/src/lib-storage/list/libstorage_list.a \
$(dovecot_incdir)/src/lib-storage/index/raw/libstorage_raw.a \
$(dovecot_incdir)/src/lib-storage/index/libstorage_index.a \
@@ -38,7 +27,6 @@ libs = \
ldadd = \
$(libs) \
- $(plugins) \
$(LIBICONV) \
$(RAND_LIBS) \
$(MODULE_LIBS)
--
GitLab