aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIain Holmes <iain@src.gnome.org>2001-01-12 08:18:15 +0800
committerIain Holmes <iain@src.gnome.org>2001-01-12 08:18:15 +0800
commitfab2c46020fd5dddb8356d753fbf86b0b07d638f (patch)
treea1d0b84707deaa821840f5faa5a0f3949c4d78d2
parentf7e2da3380627ffadd9af3755061fb5d3284f7f3 (diff)
downloadgsoc2013-evolution-fab2c46020fd5dddb8356d753fbf86b0b07d638f.tar
gsoc2013-evolution-fab2c46020fd5dddb8356d753fbf86b0b07d638f.tar.gz
gsoc2013-evolution-fab2c46020fd5dddb8356d753fbf86b0b07d638f.tar.bz2
gsoc2013-evolution-fab2c46020fd5dddb8356d753fbf86b0b07d638f.tar.lz
gsoc2013-evolution-fab2c46020fd5dddb8356d753fbf86b0b07d638f.tar.xz
gsoc2013-evolution-fab2c46020fd5dddb8356d753fbf86b0b07d638f.tar.zst
gsoc2013-evolution-fab2c46020fd5dddb8356d753fbf86b0b07d638f.zip
Some warnings cleanups
svn path=/trunk/; revision=7422
-rw-r--r--shell/Makefile.am1
-rw-r--r--shell/importer/Makefile.am10
-rw-r--r--shell/importer/importer.c1
3 files changed, 4 insertions, 8 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am
index c105e944c9..e56bc6af67 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -131,7 +131,6 @@ evolution_SOURCES = \
evolution_LDADD = \
libeshell.a \
- importer/libimporter.a \
importer/libevolution-importer.la \
$(top_builddir)/widgets/shortcut-bar/libshortcut-bar.a \
$(top_builddir)/widgets/misc/libemiscwidgets.a \
diff --git a/shell/importer/Makefile.am b/shell/importer/Makefile.am
index 9a026cd3b9..559c7a76df 100644
--- a/shell/importer/Makefile.am
+++ b/shell/importer/Makefile.am
@@ -5,8 +5,6 @@ INCLUDES = -I$(top_srcdir) -I$(includedir) $(GNOME_INCLUDEDIR) \
lib_LTLIBRARIES = libevolution-importer.la
-noinst_LIBRARIES = libimporter.a
-
IDLS = \
GNOME_Evolution_Importer.idl
@@ -25,16 +23,14 @@ $(IDL_GENERATED): $(IDLS)
idldir = $(datadir)/idl
idl_DATA = $(IDLS)
-libimporter_a_SOURCES = \
- importer.c \
- importer.h
-
libevolution_importerincludedir = $(includedir)/evolution/importer
libevolution_importer_la_SOURCES = \
$(IDL_GENERATED) \
evolution-importer-factory.c \
evolution-importer-client.c \
- evolution-importer.c
+ evolution-importer.c \
+ importer.c \
+ importer.h
libevolution_importerinclude_HEADERS = \
evolution-importer-factory.h \
diff --git a/shell/importer/importer.c b/shell/importer/importer.c
index 71373937db..2201912fcd 100644
--- a/shell/importer/importer.c
+++ b/shell/importer/importer.c
@@ -36,6 +36,7 @@
#include <e-util/e-html-utils.h>
#include "importer.h"
+#include "GNOME_Evolution_Importer.h"
typedef struct _ImportDialogFilePage {
GtkWidget *vbox;