Index: art/Makefile.am
===================================================================
--- art/Makefile.am	(révision 33605)
+++ art/Makefile.am	(copie de travail)
@@ -12,7 +12,7 @@
 
 icon48dir =  $(datadir)/icons/hicolor/48x48/apps
 icon48_DATA = \
-	48x48/preferences-autocompletion.png		\  
+	48x48/preferences-autocompletion.png		\
 	48x48/preferences-calendar-and-tasks.png  	\
 	48x48/preferences-certificates.png  		\
 	48x48/preferences-composer.png  		\
Index: addressbook/gui/component/Makefile.am
===================================================================
--- addressbook/gui/component/Makefile.am	(révision 33605)
+++ addressbook/gui/component/Makefile.am	(copie de travail)
@@ -1,4 +1,4 @@
-INCLUDES =									\
+INCLUDES =							\
 	-DG_LOG_DOMAIN=\"evolution-addressbook\"		\
 	-I$(top_srcdir)						\
 	-I$(top_srcdir)/widgets					\
@@ -60,16 +60,13 @@
 	$(EVOLUTION_ADDRESSBOOK_LIBS) $(LDAP_LIBS)
 
 
-
 libevolution_addressbook_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 # GConf schemas
 
 schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps_evolution_addressbook.schemas.in.in
-schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
-%-$(BASE_VERSION).schemas.in: %.schemas.in.in
-	cp $< $@
+schema_in_files = apps_evolution_addressbook.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
@@ -92,7 +89,7 @@
 endif
 
 server_in_files = GNOME_Evolution_Addressbook.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
+server_DATA = $(server_in_files:.server.in.in=.server)
 @EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
Index: addressbook/conduit/Makefile.am
===================================================================
--- addressbook/conduit/Makefile.am	(révision 33605)
+++ addressbook/conduit/Makefile.am	(copie de travail)
@@ -12,24 +12,24 @@
 # Address Conduit
 privconduit_LTLIBRARIES = libeaddress_conduit.la
 
-libeaddress_conduit_la_SOURCES = \
+libeaddress_conduit_la_SOURCES = 		\
 	address-conduit.c
 
 libeaddress_conduit_la_LDFLAGS = -module -avoid-version
+
 libeaddress_conduit_la_LIBADD = 					\
 	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/e-util/libeconduit.la		 		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la		 	\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS)
 
-e-address-$(BASE_VERSION).conduit: e-address.conduit.in
+e-address.conduit: e-address.conduit.in
 	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 		\
 	    -e 's^\@datadir\@^$(datadir)^g' 				\
 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
 	    $< > $@
 
 conduitdir = $(datadir)/gnome-pilot/conduits/
-conduit_DATA = e-address-$(BASE_VERSION).conduit
+conduit_DATA = e-address.conduit
 
 BUILT_SOURCES = $(conduit_DATA)
 CLEANFILES = $(BUILT_SOURCES)
Index: addressbook/Makefile.am
===================================================================
--- addressbook/Makefile.am	(révision 33605)
+++ addressbook/Makefile.am	(copie de travail)
@@ -1,12 +1,13 @@
+
+SUBDIRS = util printing importers gui tools
+
 if ENABLE_PILOT_CONDUITS
-CONDUIT_SUBDIR=conduit
+SUBDIRS += conduit
 endif
 
-SUBDIRS =	\
-	util printing importers gui tools $(CONDUIT_SUBDIR)
-
 error_DATA = addressbook.error
 errordir = $(privdatadir)/errors
+
 @EVO_PLUGIN_RULE@
 
 EXTRA_DIST =			\
Index: shell/Makefile.am
===================================================================
--- shell/Makefile.am	(révision 33605)
+++ shell/Makefile.am	(copie de travail)
@@ -96,10 +96,10 @@
 	es-event.h				\
 	es-menu.h
 
-libeshell_la_SOURCES = 				\
+libeshell_la_SOURCES =				\
 	$(IDL_GENERATED)			\
 	$(MARSHAL_GENERATED)			\
-	e-component-view.c		\
+	e-component-view.c			\
 	evolution-component.c			\
 	evolution-listener.c			\
 	e-shell-utils.c				\
@@ -176,14 +176,14 @@
 
 if ENABLE_TEST_COMPONENT
 testserver_in_files = GNOME_Evolution_Test.server.in.in
-testserver_DATA = $(testserver_in_files:.server.in.in=_$(BASE_VERSION).server)
+testserver_DATA = $(testserver_in_files:.server.in.in=.server)
 testserverdir = $(serverdir)
 endif
 
 # Misc stuff
 
 server_in_files = GNOME_Evolution_Shell.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
+server_DATA = $(server_in_files:.server.in.in=.server)
 @EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
@@ -198,10 +198,8 @@
 # GConf schemas
 
 schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps_evolution_shell.schemas.in.in
-schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
-%-$(BASE_VERSION).schemas.in: %.schemas.in.in
-	cp $< $@
+schema_in_files = apps_evolution_shell.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
Index: smime/Makefile.am
===================================================================
--- smime/Makefile.am	(révision 33605)
+++ smime/Makefile.am	(copie de travail)
@@ -1 +1 @@
-SUBDIRS= lib gui
\ Pas de fin de ligne à la fin du fichier.
+SUBDIRS = lib gui
Index: plugins/bogo-junk-plugin/Makefile.am
===================================================================
--- plugins/bogo-junk-plugin/Makefile.am	(révision 33605)
+++ plugins/bogo-junk-plugin/Makefile.am	(copie de travail)
@@ -11,11 +11,8 @@
 liborg_gnome_bogo_junk_plugin_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = bogo-junk-plugin.schemas.in.in
-schema_DATA     = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
-
-%-$(BASE_VERSION).schemas.in: %.schemas.in.in
-	cp $< $@
+schema_in_files = bogo-junk-plugin.schemas.in
+schema_DATA     = $(schema_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
Index: plugins/default-mailer/Makefile.am
===================================================================
--- plugins/default-mailer/Makefile.am	(révision 33605)
+++ plugins/default-mailer/Makefile.am	(copie de travail)
@@ -14,22 +14,19 @@
 liborg_gnome_default_mailer_la_LDFLAGS = -module -avoid-version
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in.in
-schema_DATA     = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
-
-%-$(BASE_VERSION).schemas.in: %.schemas.in.in
-	cp $< $@
+schema_in_files = apps-evolution-mail-prompts-checkdefault.schemas.in
+schema_DATA     = $(schema_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
 install-data-local:
-	if test -z "$(DESTDIR)" ; then                                                                                          \
-		for p in $(schema_DATA) ; do                                                                                    \
-			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p;             \
-		done                                                                                                            \
+	if test -z "$(DESTDIR)" ; then											\
+		for p in $(schema_DATA) ; do										\
+			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $$p;	\
+		done													\
 	fi
 
-EXTRA_DIST = \
+EXTRA_DIST =					\
 	org-gnome-default-mailer.eplug.xml	\
 	org-gnome-default-mailer.error.xml	\
 	$(schema_in_files)
Index: plugins/import-ics-attachments/Makefile.am
===================================================================
--- plugins/import-ics-attachments/Makefile.am	(révision 33605)
+++ plugins/import-ics-attachments/Makefile.am	(copie de travail)
@@ -28,4 +28,5 @@
 
 EXTRA_DIST = org-gnome-evolution-mail-attachments-import-ics.eplug.xml
 
-CLEANFILES = org-gnome-evolution-mail-attachments-import-ics.eplug
+BUILT_SOURCES = $(plugin_DATA)
+CLEANFILES = $(BUILT_SOURCES)
Index: plugins/mail-notification/Makefile.am
===================================================================
--- plugins/mail-notification/Makefile.am	(révision 33605)
+++ plugins/mail-notification/Makefile.am	(copie de travail)
@@ -1,14 +1,10 @@
-INCLUDES =						\
-	-I$(top_srcdir)					\
+INCLUDES =					\
+	-I$(top_srcdir)				\
 	-DDBUS_API_SUBJECT_TO_CHANGE=1		\
 	-DDBUS_VERSION=$(DBUS_VERSION)          \
-	$(EVOLUTION_MAIL_CFLAGS)				\
-	$(LIBNOTIFY_CFLAGS)
-	$(NMN_CFLAGS)						
-
-LIBS =							\
-	$(LIBNOTIFY_LIBS)				\
-	$(NMN_LIBS)
+	$(EVOLUTION_MAIL_CFLAGS)		\
+	$(LIBNOTIFY_CFLAGS)			\
+	$(NMN_CFLAGS)
 
 @EVO_PLUGIN_RULE@
 
@@ -16,14 +12,14 @@
 plugin_LTLIBRARIES = liborg-gnome-mail-notification.la
 
 liborg_gnome_mail_notification_la_SOURCES = mail-notification.c
-liborg_gnome_mail_notification_la_LDFLAGS = -module -avoid-version
+liborg_gnome_mail_notification_la_LDFLAGS = 	\
+	-module -avoid-version			\
+	$(LIBNOTIFY_LIBS)			\
+	$(NMN_LIBS)
 
 schemadir       = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps-evolution-mail-notification.schemas.in.in
-schema_DATA     = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
-
-%-$(BASE_VERSION).schemas.in: %.schemas.in.in
-	cp $< $@
+schema_in_files = apps-evolution-mail-notification.schemas.in
+schema_DATA     = $(schema_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
@@ -40,6 +36,6 @@
 
 DISTCLEANFILES = $(schema_DATA)
 
-EXTRA_DIST = \
+EXTRA_DIST = 					\
 	org-gnome-mail-notification.eplug.xml	\
 	$(schema_in_files)
Index: mail/Makefile.am
===================================================================
--- mail/Makefile.am	(révision 33605)
+++ mail/Makefile.am	(copie de travail)
@@ -37,9 +37,9 @@
 
 SPELL_IDL = Spell.idl
 
-SPELL_IDL_GENERATED_H = 		\
+SPELL_IDL_GENERATED_H = \
 	Spell.h
-SPELL_IDL_GENERATED_C = 		\
+SPELL_IDL_GENERATED_C = \
 	Spell-common.c		\
 	Spell-skels.c		\
 	Spell-stubs.c
@@ -53,9 +53,9 @@
 
 # Mail.idl
 MAIL_IDL = Evolution-Mail.idl
-MAIL_IDL_GENERATED_H = 		\
+MAIL_IDL_GENERATED_H = \
 	Evolution-Mail.h
-MAIL_IDL_GENERATED_C = 		\
+MAIL_IDL_GENERATED_C = \
 	Evolution-Mail-common.c		\
 	Evolution-Mail-skels.c		\
 	Evolution-Mail-stubs.c
@@ -206,13 +206,12 @@
 	message-tag-followup.h
 
 if ENABLE_SMIME
-SMIME_LIBS =						\
+SMIME_LIBS = 				\
 	$(top_builddir)/smime/lib/libessmime.la		\
 	$(top_builddir)/smime/gui/libevolution-smime.la
 endif
 
 libevolution_mail_la_LIBADD =					\
-	$(top_builddir)/mail/importers/libevolution-mail-importers.la\
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
 	$(top_builddir)/composer/libcomposer.la			\
@@ -225,14 +224,14 @@
 	$(top_builddir)/addressbook/util/libeabutil.la		\
 	$(top_builddir)/addressbook/gui/contact-editor/libecontacteditor.la \
 	$(top_builddir)/addressbook/gui/contact-list-editor/libecontactlisteditor.la \
-	$(top_builddir)/mail/importers/libevolution-mail-importers.la\
-	$(SMIME_LIBS)						\
+	$(top_builddir)/mail/importers/libevolution-mail-importers.la	\
+	$(SMIME_LIBS)
 	$(EVOLUTION_MAIL_LIBS)					\
 	$(GTKHTML_LIBS)						\
 	$(REGEX_LIBS)						\
 	$(THREADS_LIBS)
 
-libevolution_mail_la_LDFLAGS =				\
+libevolution_mail_la_LDFLAGS = 			\
 	-avoid-version -module $(NO_UNDEFINED)
 
 libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h
@@ -240,7 +239,8 @@
 # .server files
 
 server_in_files = GNOME_Evolution_Mail.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
+server_DATA = $(server_in_files:.server.in.in=.server)
+
 @EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
@@ -297,11 +297,8 @@
 # GConf
 
 schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = evolution-mail.schemas.in.in
-schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
-%-$(BASE_VERSION).schemas.in: %.schemas.in.in
-	cp $< $@
-
+schema_in_files = evolution-mail.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 @INTLTOOL_SCHEMAS_RULE@
 
 if OS_WIN32
Index: calendar/gui/alarm-notify/Makefile.am
===================================================================
--- calendar/gui/alarm-notify/Makefile.am	(révision 33605)
+++ calendar/gui/alarm-notify/Makefile.am	(copie de travail)
@@ -54,7 +54,7 @@
 	$(EVOLUTION_CALENDAR_LIBS)
 
 server_in_files = GNOME_Evolution_Calendar_AlarmNotify.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
+server_DATA = $(server_in_files:.server.in.in=.server)
 @EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
Index: calendar/gui/Makefile.am
===================================================================
--- calendar/gui/Makefile.am	(révision 33605)
+++ calendar/gui/Makefile.am	(copie de travail)
@@ -244,17 +244,15 @@
 libevolution_calendar_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
 
 server_in_files = GNOME_Evolution_Calendar.server.in.in
-server_DATA = $(server_in_files:.server.in.in=_$(BASE_VERSION).server)
+server_DATA = $(server_in_files:.server.in.in=.server)
 @EVO_SERVER_RULE@
 @INTLTOOL_SERVER_RULE@
 
 # GConf schemas
 
 schemadir   = $(GCONF_SCHEMA_FILE_DIR)
-schema_in_files = apps_evolution_calendar.schemas.in.in
-schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
-%-$(BASE_VERSION).schemas.in: %.schemas.in.in
-	cp $< $@
+schema_in_files = apps_evolution_calendar.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
 @INTLTOOL_SCHEMAS_RULE@
 
Index: calendar/conduits/todo/Makefile.am
===================================================================
--- calendar/conduits/todo/Makefile.am	(révision 33605)
+++ calendar/conduits/todo/Makefile.am	(copie de travail)
@@ -8,24 +8,25 @@
 # ToDo Conduit
 privconduit_LTLIBRARIES = libetodo_conduit.la
 
-libetodo_conduit_la_SOURCES = 	\
+libetodo_conduit_la_SOURCES = 			\
 	todo-conduit.c
 
 libetodo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 libetodo_conduit_la_LIBADD = 						\
 	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/e-util/libeconduit.la		 		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la		 	\
+	$(top_builddir)/e-util/libeconduit.la				\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
 
-e-todo-$(BASE_VERSION).conduit: e-todo.conduit.in
-	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 			\
+e-todo.conduit: e-todo.conduit.in
+	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 		\
 	    -e 's^\@datadir\@^$(datadir)^g' 				\
 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
 	    $< > $@
 
 conduitdir = $(datadir)/gnome-pilot/conduits/
-conduit_DATA = e-todo-$(BASE_VERSION).conduit
+conduit_DATA = e-todo.conduit
 
 BUILT_SOURCES = $(conduit_DATA)
 CLEANFILES = $(BUILT_SOURCES)
@@ -34,4 +35,4 @@
 	e-todo.conduit.in
 
 dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
\ Pas de fin de ligne à la fin du fichier.
+	cd $(distdir); rm -f $(BUILT_SOURCES)
Index: calendar/conduits/calendar/Makefile.am
===================================================================
--- calendar/conduits/calendar/Makefile.am	(révision 33605)
+++ calendar/conduits/calendar/Makefile.am	(copie de travail)
@@ -8,24 +8,25 @@
 # Calendar Conduit
 privconduit_LTLIBRARIES = libecalendar_conduit.la
 
-libecalendar_conduit_la_SOURCES = 	\
+libecalendar_conduit_la_SOURCES = 		\
 	calendar-conduit.c
 
 libecalendar_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 libecalendar_conduit_la_LIBADD = 					\
 	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/e-util/libeconduit.la	 			\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la	 		\
+	$(top_builddir)/e-util/libeconduit.la				\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
 
-e-calendar-$(BASE_VERSION).conduit: e-calendar.conduit.in
-	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 				\
+e-calendar.conduit: e-calendar.conduit.in
+	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g'		\
 	    -e 's^\@datadir\@^$(datadir)^g' 				\
 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
 	    $< > $@
 
 conduitdir = $(datadir)/gnome-pilot/conduits/
-conduit_DATA = e-calendar-$(BASE_VERSION).conduit
+conduit_DATA = e-calendar.conduit
 
 BUILT_SOURCES = $(conduit_DATA)
 CLEANFILES = $(BUILT_SOURCES)
@@ -34,4 +35,4 @@
 	e-calendar.conduit.in
 
 dist-hook:
-	cd $(distdir); rm -f $(BUILT_SOURCES)
\ Pas de fin de ligne à la fin du fichier.
+	cd $(distdir); rm -f $(BUILT_SOURCES)
Index: calendar/conduits/memo/Makefile.am
===================================================================
--- calendar/conduits/memo/Makefile.am	(révision 33605)
+++ calendar/conduits/memo/Makefile.am	(copie de travail)
@@ -8,24 +8,25 @@
 # Memo Conduit
 privconduit_LTLIBRARIES = libememo_conduit.la
 
-libememo_conduit_la_SOURCES = 	\
+libememo_conduit_la_SOURCES = 			\
 	memo-conduit.c
 
-libememo_conduit_la_LDFLAGS = -module -avoid-version
+libememo_conduit_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED)
+
 libememo_conduit_la_LIBADD = 						\
 	$(top_builddir)/e-util/libeutil.la				\
-	$(top_builddir)/e-util/libeconduit.la		 		\
-	$(top_builddir)/widgets/misc/libemiscwidgets.la		 	\
+	$(top_builddir)/e-util/libeconduit.la				\
+	$(top_builddir)/widgets/misc/libemiscwidgets.la			\
 	$(EVOLUTION_CALENDAR_CONDUIT_LIBS)
 
-e-memo-$(BASE_VERSION).conduit: e-memo.conduit.in
-	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 			\
+e-memo.conduit: e-memo.conduit.in
+	sed -e 's^\@privconduitdir\@^$(privconduitdir)^g' 		\
 	    -e 's^\@datadir\@^$(datadir)^g' 				\
 	    -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' 			\
 	    $< > $@
 
 conduitdir = $(datadir)/gnome-pilot/conduits/
-conduit_DATA = e-memo-$(BASE_VERSION).conduit
+conduit_DATA = e-memo.conduit
 
 BUILT_SOURCES = $(conduit_DATA)
 CLEANFILES = $(BUILT_SOURCES)
Index: calendar/Makefile.am
===================================================================
--- calendar/Makefile.am	(révision 33605)
+++ calendar/Makefile.am	(copie de travail)
@@ -1,13 +1,13 @@
+
+SUBDIRS = idl common importers gui
+
 if ENABLE_PILOT_CONDUITS
-CONDUIT_DIR = conduits
-else
-CONDUIT_DIR =
+SUBDIRS += conduits
 endif
 
-SUBDIRS = idl common importers gui $(CONDUIT_DIR)
-
 error_DATA = calendar.error
 errordir = $(privdatadir)/errors
+
 @EVO_PLUGIN_RULE@
 
 EXTRA_DIST =			\
Index: Makefile.am
===================================================================
--- Makefile.am	(révision 33605)
+++ Makefile.am	(copie de travail)
@@ -1,14 +1,12 @@
+
 changelogs =				\
 	ChangeLog			\
 	ChangeLog.pre-1-4
 
-%-$(BASE_VERSION).pc: %.pc
-	 cp $< $@
-
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = 				\
-	evolution-shell-$(BASE_VERSION).pc	\
-	evolution-plugin-$(BASE_VERSION).pc
+pkgconfig_DATA = 
+	evolution-shell.pc	\
+	evolution-plugin.pc
 
 EXTRA_DIST = 			\
 	AUTHORS			\
@@ -27,8 +25,8 @@
 	intltool-update.in	\
 	intltool-extract.in	\
 	evolution-zip.in	\
-	gnome-doc-utils.make    \
-	$(pkgconfig_DATA:-$(BASE_VERSION).pc=.pc.in)
+	gnome-doc-utils.make	\
+	$(pkgconfig_DATA:.pc=.pc.in)
 
 if ENABLE_SMIME
 SMIME_DIR=smime
@@ -60,7 +58,7 @@
 	intltool-merge 		\
 	intltool-update 	\
 	iconv-detect.h 		\
-	gnome-doc-utils.make 	\
+	gnome-doc-utils.make	\
 	$(pkgconfig_DATA)
 
 # Scrollkeeper must be disabled for distcheck to work because
Index: server.mk
===================================================================
--- server.mk	(révision 33605)
+++ server.mk	(copie de travail)
@@ -7,6 +7,3 @@
 	-e 's|\@SOEXT\@|$(SOEXT)|'				\
 	-e 's|\@INTERFACE_VERSION\@|$(INTERFACE_VERSION)|' $< > $@
 
-%_$(BASE_VERSION).server: %.server
-	mv $< $@
-
Index: po/POTFILES.in
===================================================================
--- po/POTFILES.in	(révision 33605)
+++ po/POTFILES.in	(copie de travail)
@@ -29,7 +29,7 @@
 addressbook/gui/component/addressbook-migrate.c
 addressbook/gui/component/addressbook-view.c
 addressbook/gui/component/addressbook.c
-addressbook/gui/component/apps_evolution_addressbook.schemas.in.in
+addressbook/gui/component/apps_evolution_addressbook.schemas.in
 addressbook/gui/component/ldap-config.glade
 addressbook/gui/contact-editor/contact-editor.glade
 addressbook/gui/contact-editor/e-contact-editor-address.c
@@ -84,7 +84,7 @@
 calendar/gui/alarm-notify/alarm-queue.c
 calendar/gui/alarm-notify/notify-main.c
 calendar/gui/alarm-notify/util.c
-calendar/gui/apps_evolution_calendar.schemas.in.in
+calendar/gui/apps_evolution_calendar.schemas.in
 calendar/gui/cal-search-bar.c
 calendar/gui/calendar-commands.c
 calendar/gui/calendar-component.c
@@ -225,7 +225,7 @@
 mail/em-utils.c
 mail/em-vfolder-editor.c
 mail/em-vfolder-rule.c
-mail/evolution-mail.schemas.in.in
+mail/evolution-mail.schemas.in
 mail/importers/elm-importer.c
 mail/importers/evolution-mbox-importer.c
 mail/importers/mail-importer.c
@@ -260,7 +260,7 @@
 plugins/bbdb/bbdb.c
 plugins/bbdb/org-gnome-evolution-bbdb.eplug.xml
 plugins/bogo-junk-plugin/bf-junk-filter.c
-plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in.in
+plugins/bogo-junk-plugin/bogo-junk-plugin.schemas.in
 plugins/bogo-junk-plugin/org-gnome-bogo-junk-plugin.eplug.xml
 plugins/caldav/caldav-source.c
 plugins/caldav/org-gnome-evolution-caldav.eplug.xml
@@ -270,7 +270,7 @@
 plugins/calendar-weather/calendar-weather.c
 plugins/calendar-weather/org-gnome-calendar-weather.eplug.xml
 plugins/copy-tool/org-gnome-copy-tool.eplug.xml
-plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in.in
+plugins/default-mailer/apps-evolution-mail-prompts-checkdefault.schemas.in
 plugins/default-mailer/org-gnome-default-mailer.eplug.xml
 plugins/default-mailer/org-gnome-default-mailer.error.xml
 plugins/default-source/default-source.c
@@ -344,10 +344,9 @@
 plugins/itip-formatter/org-gnome-itip-formatter.error.xml
 plugins/mail-account-disable/mail-account-disable.c
 plugins/mail-account-disable/org-gnome-mail-account-disable.eplug.xml
-plugins/mail-notification/apps-evolution-mail-notification.schemas.in.in
+plugins/mail-notification/apps-evolution-mail-notification.schemas.in
 plugins/mail-notification/mail-notification.c
 plugins/mail-notification/org-gnome-mail-notification.eplug.xml
-plugins/mail-notification/apps-evolution-mail-notification.schemas.in.in
 plugins/mail-remote/client.c
 plugins/mail-remote/e-corba-utils.c
 plugins/mail-remote/evolution-mail-store.c
@@ -393,7 +392,7 @@
 plugins/subject-thread/subject-thread.c
 shell/GNOME_Evolution_Shell.server.in.in
 shell/GNOME_Evolution_Test.server.in.in
-shell/apps_evolution_shell.schemas.in.in
+shell/apps_evolution_shell.schemas.in
 shell/e-active-connection-dialog.glade
 shell/e-component-registry.c
 shell/e-config-upgrade.c
