changeset 4851:5255476a24b5 HEAD

Don't #include a .c file. Figured out another way to do it.
author Timo Sirainen <tss@iki.fi>
date Fri, 01 Dec 2006 12:12:18 +0200
parents 0c540b6a0551
children 68edda84b056
files src/plugins/convert/Makefile.am src/plugins/convert/convert-tool.c
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/plugins/convert/Makefile.am	Mon Nov 27 03:50:16 2006 +0200
+++ b/src/plugins/convert/Makefile.am	Fri Dec 01 12:12:18 2006 +0200
@@ -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)
--- a/src/plugins/convert/convert-tool.c	Mon Nov 27 03:50:16 2006 +0200
+++ b/src/plugins/convert/convert-tool.c	Fri Dec 01 12:12:18 2006 +0200
@@ -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;