Rename Evolution module libraries.

Drop the "libevolution" prefix so it's not so verbose and also
consistent with upcoming evolution-data-server module libraries.

  libevolution-module-foo.so --> module-foo.so

16 files changed, 80 insertions, 81 deletions

diff --git a/modules/addressbook/Makefile.am b/modules/addressbook/Makefile.am
index 5757ac2e74..3c21012ec4 100644
--- a/modules/addressbook/Makefile.am
+++ b/modules/addressbook/Makefile.am
@@ -1,6 +1,6 @@
-module_LTLIBRARIES = libevolution-module-addressbook.la
+module_LTLIBRARIES = module-addressbook.la
 
-libevolution_module_addressbook_la_CPPFLAGS =			\
+module_addressbook_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)						\
 	-DG_LOG_DOMAIN=\"evolution-addressbook\"		\
 	-I$(top_srcdir)						\
@@ -25,7 +25,7 @@ libevolution_module_addressbook_la_CPPFLAGS =			\
 	$(LDAP_CFLAGS)						\
 	$(CHAMPLAIN_CFLAGS)
 
-libevolution_module_addressbook_la_SOURCES = \
+module_addressbook_la_SOURCES = \
 	evolution-module-addressbook.c				\
 	addressbook-config.c					\
 	addressbook-config.h					\
@@ -56,7 +56,7 @@ if ENABLE_SMIME
 SMIME_LIB=$(top_builddir)/smime/gui/libevolution-smime.la
 endif
 
-libevolution_module_addressbook_la_LIBADD =			\
+module_addressbook_la_LIBADD = \
 	$(SMIME_LIB)						\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/composer/libcomposer.la			\
@@ -79,7 +79,7 @@ libevolution_module_addressbook_la_LIBADD =			\
 	$(LDAP_LIBS)
 
 
-libevolution_module_addressbook_la_LDFLAGS = \
+module_addressbook_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 # GConf schemas
diff --git a/modules/bogofilter/Makefile.am b/modules/bogofilter/Makefile.am
index 2d8f5c9fd2..225e2a47c7 100644
--- a/modules/bogofilter/Makefile.am
+++ b/modules/bogofilter/Makefile.am
@@ -1,6 +1,6 @@
-module_LTLIBRARIES = libevolution-module-bogofilter.la
+module_LTLIBRARIES = module-bogofilter.la
 
-libevolution_module_bogofilter_la_CPPFLAGS =			\
+module_bogofilter_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-DG_LOG_DOMAIN=\"evolution-bogofilter\"			\
@@ -8,10 +8,10 @@ libevolution_module_bogofilter_la_CPPFLAGS =			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)
 
-libevolution_module_bogofilter_la_SOURCES =			\
+module_bogofilter_la_SOURCES = \
 	evolution-bogofilter.c
 
-libevolution_module_bogofilter_la_LIBADD =			\
+module_bogofilter_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/libemail-engine/libemail-engine.la \
@@ -19,7 +19,7 @@ libevolution_module_bogofilter_la_LIBADD =			\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
-libevolution_module_bogofilter_la_LDFLAGS =			\
+module_bogofilter_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
diff --git a/modules/calendar/Makefile.am b/modules/calendar/Makefile.am
index cd037e539e..7965f218b0 100644
--- a/modules/calendar/Makefile.am
+++ b/modules/calendar/Makefile.am
@@ -1,7 +1,6 @@
-module_LTLIBRARIES =					\
-	libevolution-module-calendar.la
+module_LTLIBRARIES = module-calendar.la
 
-libevolution_module_calendar_la_CPPFLAGS =		\
+module_calendar_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)					\
 	-DG_LOG_DOMAIN=\"calendar-modules\"		\
 	-I$(top_srcdir)					\
@@ -11,7 +10,7 @@ libevolution_module_calendar_la_CPPFLAGS =		\
 	$(GNOME_PLATFORM_CFLAGS)			\
 	$(GTKHTML_CFLAGS)
 
-libevolution_module_calendar_la_SOURCES =		\
+module_calendar_la_SOURCES = \
 	evolution-module-calendar.c			\
 	e-cal-attachment-handler.c			\
 	e-cal-attachment-handler.h			\
@@ -82,7 +81,7 @@ libevolution_module_calendar_la_SOURCES =		\
 	e-task-shell-view-private.c			\
 	e-task-shell-view-private.h
 
-libevolution_module_calendar_la_LIBADD =		\
+module_calendar_la_LIBADD = \
 	$(top_builddir)/shell/libeshell.la		\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(top_builddir)/calendar/importers/libevolution-calendar-importers.la	\
@@ -100,7 +99,7 @@ libevolution_module_calendar_la_LIBADD =		\
 	$(GNOME_PLATFORM_LIBS)						\
 	$(GTKHTML_LIBS)
 
-libevolution_module_calendar_la_LDFLAGS =		\
+module_calendar_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
diff --git a/modules/composer-autosave/Makefile.am b/modules/composer-autosave/Makefile.am
index 880d62a58e..3f62e4c05c 100644
--- a/modules/composer-autosave/Makefile.am
+++ b/modules/composer-autosave/Makefile.am
@@ -1,6 +1,6 @@
-module_LTLIBRARIES = libevolution-module-composer-autosave.la
+module_LTLIBRARIES = module-composer-autosave.la
 
-libevolution_module_composer_autosave_la_CPPFLAGS =		\
+module_composer_autosave_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
@@ -9,14 +9,14 @@ libevolution_module_composer_autosave_la_CPPFLAGS =		\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GTKHTML_CFLAGS)
 
-libevolution_module_composer_autosave_la_SOURCES =		\
+module_composer_autosave_la_SOURCES = \
 	evolution-composer-autosave.c				\
 	e-autosave-utils.c					\
 	e-autosave-utils.h					\
 	e-composer-autosave.c					\
 	e-composer-registry.c
 
-libevolution_module_composer_autosave_la_LIBADD =		\
+module_composer_autosave_la_LIBADD = \
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/composer/libcomposer.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
@@ -26,7 +26,7 @@ libevolution_module_composer_autosave_la_LIBADD =		\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GTKHTML_LIBS)
 
-libevolution_module_composer_autosave_la_LDFLAGS =		\
+module_composer_autosave_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/mail/Makefile.am b/modules/mail/Makefile.am
index 6f79d002d3..25b5b15ef4 100644
--- a/modules/mail/Makefile.am
+++ b/modules/mail/Makefile.am
@@ -1,6 +1,6 @@
-module_LTLIBRARIES = libevolution-module-mail.la
+module_LTLIBRARIES = module-mail.la
 
-libevolution_module_mail_la_CPPFLAGS =					\
+module_mail_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)							\
 	-I$(top_srcdir)							\
 	-I$(top_srcdir)/widgets						\
@@ -12,7 +12,7 @@ libevolution_module_mail_la_CPPFLAGS =					\
 	$(GNOME_PLATFORM_CFLAGS)					\
 	$(GTKHTML_CFLAGS)
 
-libevolution_module_mail_la_SOURCES =					\
+module_mail_la_SOURCES = \
 	evolution-module-mail.c						\
 	e-mail-attachment-handler.c					\
 	e-mail-attachment-handler.h					\
@@ -49,7 +49,7 @@ libevolution_module_mail_la_SOURCES =					\
 	em-network-prefs.c						\
 	em-network-prefs.h
 
-libevolution_module_mail_la_LIBADD =					\
+module_mail_la_LIBADD = \
 	$(top_builddir)/libemail-utils/libemail-utils.la		\
 	$(top_builddir)/libemail-engine/libemail-engine.la		\
 	$(top_builddir)/e-util/libeutil.la				\
@@ -72,7 +72,7 @@ libevolution_module_mail_la_LIBADD =					\
 	$(GNOME_PLATFORM_LIBS)						\
 	$(GTKHTML_LIBS)
 
-libevolution_module_mail_la_LDFLAGS =					\
+module_mail_la_LDFLAGS = \
 	-avoid-version -module $(NO_UNDEFINED)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/mailto-handler/Makefile.am b/modules/mailto-handler/Makefile.am
index 4e5598b498..f4349cf3fb 100644
--- a/modules/mailto-handler/Makefile.am
+++ b/modules/mailto-handler/Makefile.am
@@ -1,6 +1,6 @@
-module_LTLIBRARIES = libevolution-module-mailto-handler.la
+module_LTLIBRARIES = module-mailto-handler.la
 
-libevolution_module_mailto_handler_la_CPPFLAGS =		\
+module_mailto_handler_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-DG_LOG_DOMAIN=\"evolution-mailto-handler\"		\
@@ -8,17 +8,17 @@ libevolution_module_mailto_handler_la_CPPFLAGS =		\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GTKHTML_CFLAGS)
 
-libevolution_module_mailto_handler_la_SOURCES =			\
+module_mailto_handler_la_SOURCES = \
 	evolution-mailto-handler.c
 
-libevolution_module_mailto_handler_la_LIBADD =			\
+module_mailto_handler_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GTKHTML_LIBS)
 
-libevolution_module_mailto_handler_la_LDFLAGS =			\
+module_mailto_handler_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
diff --git a/modules/mdn/Makefile.am b/modules/mdn/Makefile.am
index 0f74b72e90..bd6cbb9eb6 100644
--- a/modules/mdn/Makefile.am
+++ b/modules/mdn/Makefile.am
@@ -1,6 +1,6 @@
-module_LTLIBRARIES = libevolution-module-mdn.la
+module_LTLIBRARIES = module-mdn.la
 
-libevolution_module_mdn_la_CPPFLAGS =				\
+module_mdn_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
@@ -9,10 +9,10 @@ libevolution_module_mdn_la_CPPFLAGS =				\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GTKHTML_CFLAGS)
 
-libevolution_module_mdn_la_SOURCES =				\
+module_mdn_la_SOURCES = \
 	evolution-mdn.c
 
-libevolution_module_mdn_la_LIBADD =				\
+module_mdn_la_LIBADD = \
 	$(top_builddir)/libemail-engine/libemail-engine.la	\
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/e-util/libeutil.la			\
@@ -22,7 +22,7 @@ libevolution_module_mdn_la_LIBADD =				\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GTKHTML_LIBS)
 
-libevolution_module_mdn_la_LDFLAGS =				\
+module_mdn_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 error_DATA = evolution-mdn.error
diff --git a/modules/offline-alert/Makefile.am b/modules/offline-alert/Makefile.am
index e6bb42284b..9673a2778d 100644
--- a/modules/offline-alert/Makefile.am
+++ b/modules/offline-alert/Makefile.am
@@ -1,6 +1,6 @@
-module_LTLIBRARIES = libevolution-module-offline-alert.la
+module_LTLIBRARIES = module-offline-alert.la
 
-libevolution_module_offline_alert_la_CPPFLAGS =			\
+module_offline_alert_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
@@ -8,17 +8,17 @@ libevolution_module_offline_alert_la_CPPFLAGS =			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)
 
-libevolution_module_offline_alert_la_SOURCES =			\
+module_offline_alert_la_SOURCES = \
 	evolution-offline-alert.c
 
-libevolution_module_offline_alert_la_LIBADD =			\
+module_offline_alert_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/libevolution-utils/libevolution-utils.la \
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
-libevolution_module_offline_alert_la_LDFLAGS =			\
+module_offline_alert_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 error_DATA = evolution-offline-alert.error
diff --git a/modules/online-accounts/Makefile.am b/modules/online-accounts/Makefile.am
index f449247ec9..6c2f16883a 100644
--- a/modules/online-accounts/Makefile.am
+++ b/modules/online-accounts/Makefile.am
@@ -1,6 +1,6 @@
-module_LTLIBRARIES = libevolution-module-online-accounts.la
+module_LTLIBRARIES = module-online-accounts.la
 
-libevolution_module_online_accounts_la_CPPFLAGS =		\
+module_online_accounts_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-DG_LOG_DOMAIN=\"evolution-online-accounts\"		\
@@ -8,14 +8,14 @@ libevolution_module_online_accounts_la_CPPFLAGS =		\
 	$(GNOME_PLATFORM_CFLAGS)				\
 	$(GOA_CFLAGS)
 
-libevolution_module_online_accounts_la_SOURCES =		\
+module_online_accounts_la_SOURCES = \
 	evolution-online-accounts.c				\
 	e-online-accounts-google.c				\
 	e-online-accounts-google.h				\
 	camel-sasl-xoauth.c					\
 	camel-sasl-xoauth.h
 
-libevolution_module_online_accounts_la_LIBADD =			\
+module_online_accounts_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/libemail-utils/libemail-utils.la  \
@@ -23,7 +23,7 @@ libevolution_module_online_accounts_la_LIBADD =			\
 	$(GNOME_PLATFORM_LIBS)					\
 	$(GOA_LIBS)
 
-libevolution_module_online_accounts_la_LDFLAGS =		\
+module_online_accounts_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/plugin-lib/Makefile.am b/modules/plugin-lib/Makefile.am
index 1f74550cb7..0933861156 100644
--- a/modules/plugin-lib/Makefile.am
+++ b/modules/plugin-lib/Makefile.am
@@ -1,22 +1,22 @@
-module_LTLIBRARIES = libevolution-module-plugin-lib.la
+module_LTLIBRARIES = module-plugin-lib.la
 
-libevolution_module_plugin_lib_la_CPPFLAGS =			\
+module_plugin_lib_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)						\
 	-DG_LOG_DOMAIN=\"evolution-plugin-lib\"			\
 	-I$(top_srcdir)						\
 	-DEVOLUTION_PREFIX=\""$(prefix)"\"			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)
 
-libevolution_module_plugin_lib_la_SOURCES =			\
+module_plugin_lib_la_SOURCES = \
 	evolution-module-plugin-lib.c				\
 	e-plugin-lib.c						\
 	e-plugin-lib.h
 
-libevolution_module_plugin_lib_la_LIBADD =			\
+module_plugin_lib_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(EVOLUTION_DATA_SERVER_LIBS)
 
-libevolution_module_plugin_lib_la_LDFLAGS =			\
+module_plugin_lib_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/plugin-manager/Makefile.am b/modules/plugin-manager/Makefile.am
index f350426b50..03eaa3d77a 100644
--- a/modules/plugin-manager/Makefile.am
+++ b/modules/plugin-manager/Makefile.am
@@ -1,6 +1,6 @@
-module_LTLIBRARIES = libevolution-module-plugin-manager.la
+module_LTLIBRARIES = module-plugin-manager.la
 
-libevolution_module_plugin_manager_la_CPPFLAGS =		\
+module_plugin_manager_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
@@ -8,16 +8,16 @@ libevolution_module_plugin_manager_la_CPPFLAGS =		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)
 
-libevolution_module_plugin_manager_la_SOURCES =			\
+module_plugin_manager_la_SOURCES = \
 	evolution-plugin-manager.c
 
-libevolution_module_plugin_manager_la_LIBADD =			\
+module_plugin_manager_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
-libevolution_module_plugin_manager_la_LDFLAGS =			\
+module_plugin_manager_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/plugin-mono/Makefile.am b/modules/plugin-mono/Makefile.am
index a685cd89bd..be9e94e7ba 100644
--- a/modules/plugin-mono/Makefile.am
+++ b/modules/plugin-mono/Makefile.am
@@ -1,23 +1,23 @@
-module_LTLIBRARIES = libevolution-module-plugin-mono.la
+module_LTLIBRARIES = module-plugin-mono.la
 
-libevolution_module_plugin_mono_la_CPPFLAGS =			\
+module_plugin_mono_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)						\
 	-DG_LOG_DOMAIN=\"evolution-plugin-mono\"		\
 	-I$(top_srcdir)						\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(MONO_CFLAGS)
 
-libevolution_module_plugin_mono_la_SOURCES =			\
+module_plugin_mono_la_SOURCES = \
 	evolution-module-plugin-mono.c				\
 	e-plugin-mono.c						\
 	e-plugin-mono.h
 
-libevolution_module_plugin_mono_la_LIBADD =			\
+module_plugin_mono_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(MONO_LIBS)
 
-libevolution_module_plugin_mono_la_LDFLAGS =			\
+module_plugin_mono_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/plugin-python/Makefile.am b/modules/plugin-python/Makefile.am
index 435ab31c0f..aaeca9abc5 100644
--- a/modules/plugin-python/Makefile.am
+++ b/modules/plugin-python/Makefile.am
@@ -1,24 +1,24 @@
-module_LTLIBRARIES = libevolution-module-plugin-python.la
+module_LTLIBRARIES = module-plugin-python.la
 
-libevolution_module_plugin_python_la_CPPFLAGS =			\
+module_plugin_python_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)						\
 	-DG_LOG_DOMAIN=\"evolution-plugin-python\"		\
 	-I$(top_srcdir)						\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(PY_INCLUDES)
 
-libevolution_module_plugin_python_la_SOURCES =			\
+module_plugin_python_la_SOURCES = \
 	evolution-module-plugin-python.c			\
 	e-plugin-python.c					\
 	e-plugin-python.h
 
-libevolution_module_plugin_python_la_LIBADD =			\
+module_plugin_python_la_LIBADD = \
 	-ldl -lutil -lm						\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(PY_LIBS)
 
-libevolution_module_plugin_python_la_LDFLAGS =			\
+module_plugin_python_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 example_sources =						\
diff --git a/modules/spamassassin/Makefile.am b/modules/spamassassin/Makefile.am
index fce8989566..cb8f5778fa 100644
--- a/modules/spamassassin/Makefile.am
+++ b/modules/spamassassin/Makefile.am
@@ -1,16 +1,16 @@
-module_LTLIBRARIES = libevolution-module-spamassassin.la
+module_LTLIBRARIES = module-spamassassin.la
 
-libevolution_module_spamassassin_la_CPPFLAGS =			\
+module_spamassassin_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-DG_LOG_DOMAIN=\"evolution-spamassassin\"		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)
 
-libevolution_module_spamassassin_la_SOURCES =			\
+module_spamassassin_la_SOURCES = \
 	evolution-spamassassin.c
 
-libevolution_module_spamassassin_la_LIBADD =			\
+module_spamassassin_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/mail/libevolution-mail.la		\
 	$(top_builddir)/shell/libeshell.la			\
@@ -19,7 +19,7 @@ libevolution_module_spamassassin_la_LIBADD =			\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
-libevolution_module_spamassassin_la_LDFLAGS =			\
+module_spamassassin_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 schemadir = $(GCONF_SCHEMA_FILE_DIR)
diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am
index ebaec22531..1401abae2f 100644
--- a/modules/startup-wizard/Makefile.am
+++ b/modules/startup-wizard/Makefile.am
@@ -1,6 +1,6 @@
-module_LTLIBRARIES = libevolution-module-startup-wizard.la
+module_LTLIBRARIES = module-startup-wizard.la
 
-libevolution_module_startup_wizard_la_CPPFLAGS =		\
+module_startup_wizard_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
@@ -8,10 +8,10 @@ libevolution_module_startup_wizard_la_CPPFLAGS =		\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)
 
-libevolution_module_startup_wizard_la_SOURCES =			\
+module_startup_wizard_la_SOURCES = \
 	evolution-startup-wizard.c
 
-libevolution_module_startup_wizard_la_LIBADD =			\
+module_startup_wizard_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/widgets/e-timezone-dialog/libetimezonedialog.la \
@@ -24,7 +24,7 @@ libevolution_module_startup_wizard_la_LIBADD =			\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
-libevolution_module_startup_wizard_la_LDFLAGS =			\
+module_startup_wizard_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 -include $(top_srcdir)/git.mk
diff --git a/modules/web-inspector/Makefile.am b/modules/web-inspector/Makefile.am
index f8a1fc9340..dfd999c213 100644
--- a/modules/web-inspector/Makefile.am
+++ b/modules/web-inspector/Makefile.am
@@ -1,6 +1,6 @@
-module_LTLIBRARIES = libevolution-module-web-inspector.la
+module_LTLIBRARIES = module-web-inspector.la
 
-libevolution_module_web_inspector_la_CPPFLAGS =			\
+module_web_inspector_la_CPPFLAGS = \
 	$(AM_CPPFLAGS)						\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
@@ -8,16 +8,16 @@ libevolution_module_web_inspector_la_CPPFLAGS =			\
 	$(EVOLUTION_DATA_SERVER_CFLAGS)				\
 	$(GNOME_PLATFORM_CFLAGS)
 
-libevolution_module_web_inspector_la_SOURCES =			\
+module_web_inspector_la_SOURCES = \
 	evolution-web-inspector.c
 
-libevolution_module_web_inspector_la_LIBADD =			\
+module_web_inspector_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
-libevolution_module_web_inspector_la_LDFLAGS =			\
+module_web_inspector_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 
 -include $(top_srcdir)/git.mk