From fab2c46020fd5dddb8356d753fbf86b0b07d638f Mon Sep 17 00:00:00 2001 From: Iain Holmes Date: Fri, 12 Jan 2001 00:18:15 +0000 Subject: Some warnings cleanups svn path=/trunk/; revision=7422 --- shell/Makefile.am | 1 - shell/importer/Makefile.am | 10 +++------- shell/importer/importer.c | 1 + 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 #include "importer.h" +#include "GNOME_Evolution_Importer.h" typedef struct _ImportDialogFilePage { GtkWidget *vbox; -- cgit v1.2.3