diff options
author | Michael Zucci <zucchi@src.gnome.org> | 2005-07-12 12:04:14 +0800 |
---|---|---|
committer | Michael Zucci <zucchi@src.gnome.org> | 2005-07-12 12:04:14 +0800 |
commit | 9f12922bd88bd7a83247cc7e0646c72773e2a013 (patch) | |
tree | da9a3d002dfa58ff262ef25ca3effe426fbfcc3a /shell/Makefile.am | |
parent | cf563ecd524fd20fb3cc8ebade877ad442d85c43 (diff) | |
download | gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.gz gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.bz2 gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.lz gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.xz gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.tar.zst gsoc2013-evolution-9f12922bd88bd7a83247cc7e0646c72773e2a013.zip |
Merge back eplugin-import-branch.
svn path=/trunk/; revision=29725
Diffstat (limited to 'shell/Makefile.am')
-rw-r--r-- | shell/Makefile.am | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/shell/Makefile.am b/shell/Makefile.am index 171e33cfa6..68f04c9b72 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS = importer - INCLUDES = \ -I$(top_srcdir)/widgets \ -I$(top_srcdir)/widgets/misc \ @@ -134,7 +132,6 @@ evolution_SOURCES = \ evolution_LDADD = \ libeshell.la \ - importer/libevolution-importer.la \ $(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(top_builddir)/e-util/libeutil.la \ @@ -176,7 +173,8 @@ errordir = $(privdatadir)/errors @EVO_PLUGIN_RULE@ glade_DATA = \ - e-active-connection-dialog.glade + e-active-connection-dialog.glade \ + import.glade # GConf schemas |