[dovecot-cvs] dovecot/src/plugins/convert Makefile.am, 1.7, 1.8 convert-tool.c, 1.1, 1.2

[tss at dovecot.org]

Update of /var/lib/cvs/dovecot/src/plugins/convert
In directory talvi:/tmp/cvs-serv30451

Modified Files:
	Makefile.am convert-tool.c 
Log Message:
Don't #include a .c file. Figured out another way to do it.



Index: Makefile.am
===================================================================
RCS file: /var/lib/cvs/dovecot/src/plugins/convert/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.am	16 Nov 2006 00:17:16 -0000	1.7
+++ Makefile.am	1 Dec 2006 10:12:18 -0000	1.8
@@ -25,6 +25,9 @@
 convert_tool_SOURCES = \
 	convert-tool.c
 
+common_objects = \
+	convert-storage.lo
+
 libs = \
 	$(top_builddir)/src/lib-storage/register/libstorage-register.a \
 	$(STORAGE_LIBS) \
@@ -36,6 +39,7 @@
 	$(top_builddir)/src/lib/liblib.a
 
 convert_tool_LDADD = \
+	$(common_objects) \
 	$(libs) \
 	$(LIBICONV) \
 	$(RAND_LIBS)

Index: convert-tool.c
===================================================================
RCS file: /var/lib/cvs/dovecot/src/plugins/convert/convert-tool.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- convert-tool.c	2 Feb 2006 20:42:44 -0000	1.1
+++ convert-tool.c	1 Dec 2006 10:12:18 -0000	1.2
@@ -4,12 +4,9 @@
 #include "ioloop.h"
 #include "randgen.h"
 #include "lib-signals.h"
+#include "mail-storage.h"
 #include "convert-storage.h"
 
-/* ugly, but automake doesn't like having it built as both static and
-   dynamic object.. */
-#include "convert-storage.c"
-
 int main(int argc, const char *argv[])
 {
 	struct ioloop *ioloop;