Moved fs-compress from lib-fs to lib-compression.

This solves build ordering issues.

diff --git a/src/lib-compression/Makefile.am b/src/lib-compression/Makefile.am
index 299209e903c0c7d4c1f5779266a1246b1b9545c0..cd1c680ae704271797a5d51a697b54d49fe6f0dc 100644 (file)
--- a/src/lib-compression/Makefile.am
+++ b/src/lib-compression/Makefile.am
@@ -1,7 +1,12 @@
 noinst_LTLIBRARIES = libcompression.la
 
+fs_moduledir = $(moduledir)
+fs_module_LTLIBRARIES = \
+       libfs_compress.la
+
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
+       -I$(top_srcdir)/src/lib-fs \
        -I$(top_srcdir)/src/lib-test
 
 libcompression_la_SOURCES = \
@@ -30,6 +35,11 @@ libdovecot_compression_la_LIBADD = libcompression.la ../lib-dovecot/libdovecot.l
 libdovecot_compression_la_DEPENDENCIES = libcompression.la ../lib-dovecot/libdovecot.la
 libdovecot_compression_la_LDFLAGS = -export-dynamic
 
+libfs_compress_la_SOURCES = fs-compress.c
+libfs_compress_la_LIBADD = libdovecot-compression.la
+libfs_compress_la_DEPS = libdovecot-compression.la
+libfs_compress_la_LDFLAGS = -module -avoid-version
+
 test_programs = \
        test-compression
 

diff --git a/src/lib-fs/fs-compress.c b/src/lib-compression/fs-compress.c
similarity index 100%
rename from src/lib-fs/fs-compress.c
rename to src/lib-compression/fs-compress.c

diff --git a/src/lib-fs/Makefile.am b/src/lib-fs/Makefile.am
index b3dea373417f3dc34d79d0b172c80a65096d99f8..3e1487aec906116e66b61693e3a95d600967b30a 100644 (file)
--- a/src/lib-fs/Makefile.am
+++ b/src/lib-fs/Makefile.am
@@ -1,12 +1,7 @@
 noinst_LTLIBRARIES = libfs.la
 
-fs_moduledir = $(moduledir)
-fs_module_LTLIBRARIES = \
-       libfs_compress.la
-
 AM_CPPFLAGS = \
        -I$(top_srcdir)/src/lib \
-       -I$(top_srcdir)/src/lib-compression \
        -I$(top_srcdir)/src/lib-ssl-iostream \
        -DMODULE_DIR=\""$(moduledir)"\"
 
@@ -22,11 +17,6 @@ libfs_la_SOURCES = \
        ostream-metawrap.c \
        ostream-cmp.c
 
-libfs_compress_la_SOURCES = fs-compress.c
-libfs_compress_la_LIBADD = ../lib-compression/libdovecot-compression.la
-libfs_compress_la_DEPS = ../lib-compression/libdovecot-compression.la
-libfs_compress_la_LDFLAGS = -module -avoid-version
-
 headers = \
        fs-api.h \
        fs-api-private.h \