GNOME.org
 

[evolution-exchange] Whitespace cleanup in Makefile.am.

commit 3f959f32d8c602dfbe538dd96b3cf355114b0532
Author: Matthew Barnes <mbarnes redhat com>
Date:   Sun Aug 9 00:08:45 2009 -0400

    Whitespace cleanup in Makefile.am.

 Makefile.am                |   25 ++++----
 addressbook/Makefile.am    |   76 +++++++++++-----------
 calendar/Makefile.am       |   38 +++++-----
 camel/Makefile.am          |   66 +++++++++---------
 docs/Makefile.am           |   33 +++++-----
 docs/ietf/Makefile.am      |   12 ++--
 docs/reference/Makefile.am |   45 ++++++-------
 mail/Makefile.am           |   38 +++++-----
 storage/Makefile.am        |  158 ++++++++++++++++++++++----------------------
 9 files changed, 245 insertions(+), 246 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index f44652e..28036bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,22 +1,21 @@
-SUBDIRS =				\
-	camel mail			\
-	addressbook calendar		\
-	storage				\
+SUBDIRS = \
+	camel mail \
+	addressbook calendar \
+	storage \
 	po docs
 
-DISTCLEANFILES =				\
-	intltool-extract			\
-	intltool-update				\
+DISTCLEANFILES = \
+	intltool-extract \
+	intltool-update \
 	intltool-merge
 
-EXTRA_DIST =				\
-	MAINTAINERS			\
-	intltool-extract.in		\
-	intltool-merge.in		\
-	intltool-update.in		\
+EXTRA_DIST = \
+	MAINTAINERS \
+	intltool-extract.in \
+	intltool-merge.in \
+	intltool-update.in \
 	evolution-exchange-zip.in
 
 DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
 
-
 -include $(top_srcdir)/git.mk
diff --git a/addressbook/Makefile.am b/addressbook/Makefile.am
index 0f52a82..8be9066 100644
--- a/addressbook/Makefile.am
+++ b/addressbook/Makefile.am
@@ -1,14 +1,13 @@
-AM_CPPFLAGS =						\
-	-I$(top_srcdir)					\
-	-I$(top_srcdir)/storage				\
-	-DG_LOG_DOMAIN=\"e-book-backend-exchange\"	\
-	$(ADDRESSBOOK_CFLAGS)				\
-	$(LIBEXCHANGE_CFLAGS)				\
-	$(LDAP_CFLAGS)					
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/storage \
+	-DG_LOG_DOMAIN=\"e-book-backend-exchange\" \
+	$(ADDRESSBOOK_CFLAGS) \
+	$(LIBEXCHANGE_CFLAGS) \
+	$(LDAP_CFLAGS)
 
-if HAVE_LIBDB	
-AM_CPPFLAGS += "-I /usr/include"				\
-	$(DB_CFLAGS)
+if HAVE_LIBDB
+AM_CPPFLAGS += $(DB_CFLAGS)
 endif
 
 # GConf schemas
@@ -23,49 +22,50 @@ schema_DATA = $(schema_in_files:.schemas.in.in=-$(BASE_VERSION).schemas)
 
 install-data-local:
 if OS_WIN32
-	if test -z "$(DESTDIR)" ; then \
-		for p in $(schema_DATA) ; do \
-			(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE); \
-			 echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat; \
-			cmd /c _temp.bat; \
-			rm _temp.bat; \
-		done \
+	if test -z "$(DESTDIR)" ; then  \
+		for p in $(schema_DATA) ; do  \
+			(echo set GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE);  \
+			 echo $(GCONFTOOL) --makefile-install-rule $$p) >_temp.bat;  \
+			cmd /c _temp.bat;  \
+			rm _temp.bat;  \
+		done  \
 	fi
 else
-	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
 endif
 
 noinst_LTLIBRARIES = libexchangeaddressbook.la
 
-libexchangeaddressbook_la_SOURCES =	\
-	e-book-backend-exchange.c	\
-	e-book-backend-exchange.h	\
-	e-book-backend-exchange-factory.c	\
-	e-book-backend-exchange-factory.h	\
-	e-book-backend-gal-factory.c	\
-	e-book-backend-gal-factory.h	\
-	e-book-backend-gal.c		\
-	e-book-backend-gal.h		
+libexchangeaddressbook_la_SOURCES = \
+	e-book-backend-exchange.c \
+	e-book-backend-exchange.h \
+	e-book-backend-exchange-factory.c \
+	e-book-backend-exchange-factory.h \
+	e-book-backend-gal-factory.c \
+	e-book-backend-gal-factory.h \
+	e-book-backend-gal.c \
+	e-book-backend-gal.h
 
-if HAVE_LIBDB	
-libexchangeaddressbook_la_SOURCES += e-book-backend-db-cache.c	\
-			             e-book-backend-db-cache.h	
+if HAVE_LIBDB
+libexchangeaddressbook_la_SOURCES += \
+	e-book-backend-db-cache.c \
+	e-book-backend-db-cache.h
 
-libexchangeaddressbook_la_LIBADD = 	\
+libexchangeaddressbook_la_LIBADD =  \
 	$(DB_LIBS)
 
-libexchangeaddressbook_la_LDFLAGS =	\
+libexchangeaddressbook_la_LDFLAGS = \
 	-module -avoid-version $(NO_UNDEFINED)
 endif
 
-EXTRA_DIST =				\
+EXTRA_DIST = \
 	$(schema_in_files)
- 
-CLEANFILES = \
+
+CLEANFILES =  \
 	apps_exchange_addressbook-$(BASE_VERSION).schemas
 
 -include $(top_srcdir)/git.mk
diff --git a/calendar/Makefile.am b/calendar/Makefile.am
index 1674282..6bb7f64 100644
--- a/calendar/Makefile.am
+++ b/calendar/Makefile.am
@@ -1,26 +1,26 @@
-AM_CPPFLAGS =                                                      \
-	-I$(top_srcdir)						\
-        -I$(top_srcdir)/storage					\
-	$(CALENDAR_CFLAGS)					\
-	$(LIBEXCHANGE_CFLAGS)					\
-	$(LDAP_CFLAGS)						\
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/storage \
+	$(CALENDAR_CFLAGS) \
+	$(LIBEXCHANGE_CFLAGS) \
+	$(LDAP_CFLAGS) \
 	-DG_LOG_DOMAIN=\"e-cal-backend-exchange\"
 
-noinst_LTLIBRARIES =						\
+noinst_LTLIBRARIES = \
         libexchangecalendar.la
 
-libexchangecalendar_la_SOURCES = 				\
-	e-cal-backend-exchange.c				\
-	e-cal-backend-exchange.h				\
-	e-cal-backend-exchange-calendar.c			\
-	e-cal-backend-exchange-calendar.h			\
-	e-cal-backend-exchange-tasks.c				\
-	e-cal-backend-exchange-tasks.h				\
-	e-cal-backend-exchange-factory.c			\
-	e-cal-backend-exchange-factory.h			\
-	e2k-cal-query.c						\
-	e2k-cal-query.h						\
-	e2k-cal-utils.c						\
+libexchangecalendar_la_SOURCES =  \
+	e-cal-backend-exchange.c \
+	e-cal-backend-exchange.h \
+	e-cal-backend-exchange-calendar.c \
+	e-cal-backend-exchange-calendar.h \
+	e-cal-backend-exchange-tasks.c \
+	e-cal-backend-exchange-tasks.h \
+	e-cal-backend-exchange-factory.c \
+	e-cal-backend-exchange-factory.h \
+	e2k-cal-query.c \
+	e2k-cal-query.h \
+	e2k-cal-utils.c \
 	e2k-cal-utils.h
 
 -include $(top_srcdir)/git.mk
diff --git a/camel/Makefile.am b/camel/Makefile.am
index a563757..0195f84 100644
--- a/camel/Makefile.am
+++ b/camel/Makefile.am
@@ -3,45 +3,45 @@
 CAMEL_provider_LTLIBRARIES = libcamelexchange.la
 CAMEL_provider_DATA = libcamelexchange.urls
 
-AM_CPPFLAGS =					\
-	$(WARN_CFLAGS)				\
-	$(GLIB_CFLAGS)				\
-	$(CAMEL_CFLAGS)				\
-	$(SHELL_CFLAGS)				\
-	$(LIBEXCHANGE_CFLAGS)			\
-	-DPREFIX=\"$(prefix)\"			\
-	-DCONNECTOR_LOCALEDIR=\"$(localedir)\"	\
-	-DG_LOG_DOMAIN=\"camel-exchange-provider\"	
-
-libcamelexchange_la_SOURCES = 			\
-	camel-exchange-folder.c			\
-	camel-exchange-provider.c		\
-	camel-exchange-journal.c		\
-	camel-exchange-search.c			\
-	camel-exchange-store.c			\
-	camel-exchange-summary.c		\
-	camel-exchange-transport.c		\
-	camel-stub-marshal.c			\
+AM_CPPFLAGS = \
+	$(WARN_CFLAGS) \
+	$(GLIB_CFLAGS) \
+	$(CAMEL_CFLAGS) \
+	$(SHELL_CFLAGS) \
+	$(LIBEXCHANGE_CFLAGS) \
+	-DPREFIX=\"$(prefix)\" \
+	-DCONNECTOR_LOCALEDIR=\"$(localedir)\" \
+	-DG_LOG_DOMAIN=\"camel-exchange-provider\"
+
+libcamelexchange_la_SOURCES =  \
+	camel-exchange-folder.c \
+	camel-exchange-provider.c \
+	camel-exchange-journal.c \
+	camel-exchange-search.c \
+	camel-exchange-store.c \
+	camel-exchange-summary.c \
+	camel-exchange-transport.c \
+	camel-stub-marshal.c \
 	camel-stub.c
 
-noinst_HEADERS =				\
-	camel-exchange-folder.h			\
-	camel-exchange-journal.h		\
-	camel-exchange-search.h			\
-	camel-exchange-store.h			\
-	camel-exchange-summary.h		\
-	camel-exchange-transport.h		\
-	camel-stub-constants.h			\
-	camel-stub-marshal.h			\
+noinst_HEADERS = \
+	camel-exchange-folder.h \
+	camel-exchange-journal.h \
+	camel-exchange-search.h \
+	camel-exchange-store.h \
+	camel-exchange-summary.h \
+	camel-exchange-transport.h \
+	camel-stub-constants.h \
+	camel-stub-marshal.h \
 	camel-stub.h
 
 libcamelexchange_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED)
 
-libcamelexchange_la_LIBADD = 			\
-	$(LDAP_LIBS)				\
-	$(LIBEXCHANGE_LIBS)			\
-	$(EXCHANGE_STORAGE_LIBS)		\
-	$(SOCKET_LIBS)				\
+libcamelexchange_la_LIBADD =  \
+	$(LDAP_LIBS) \
+	$(LIBEXCHANGE_LIBS) \
+	$(EXCHANGE_STORAGE_LIBS) \
+	$(SOCKET_LIBS) \
 	$(PTHREAD_LIB)
 
 EXTRA_DIST = libcamelexchange.urls
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 7022fb6..2f349fc 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -1,20 +1,21 @@
-SUBDIRS =			\
+SUBDIRS = \
 	reference
 
-EXTRA_DIST =			\
-	README			\
-	active-directory	\
-	autoconfig		\
-	debug			\
-	entryids		\
-	forms			\
-	http			\
-	mail			\
-	mapi-properties		\
-	non-ipm-subtree		\
-	openldap-ntlm.diff	\
-	rules			\
-	sending-mail		\
-	subscriptions		\
+EXTRA_DIST = \
+	README \
+	active-directory \
+	autoconfig \
+	debug \
+	entryids \
+	forms \
+	http \
+	mail \
+	mapi-properties \
+	non-ipm-subtree \
+	openldap-ntlm.diff \
+	rules \
+	sending-mail \
+	subscriptions \
 	voting
+
 -include $(top_srcdir)/git.mk
diff --git a/docs/ietf/Makefile.am b/docs/ietf/Makefile.am
index d386fe6..340dbf7 100644
--- a/docs/ietf/Makefile.am
+++ b/docs/ietf/Makefile.am
@@ -1,9 +1,9 @@
-EXTRA_DIST =					\
-	draft-brezak-spnego-http-04.txt		\
-	draft-hopmann-collection-props-00.txt	\
-	draft-davis-dasl-protocol-00.txt	\
-	draft-goland-http-udp-00.txt		\
-	rfc2518.txt				\
+EXTRA_DIST = \
+	draft-brezak-spnego-http-04.txt \
+	draft-hopmann-collection-props-00.txt \
+	draft-davis-dasl-protocol-00.txt \
+	draft-goland-http-udp-00.txt \
+	rfc2518.txt \
 	rfc2616.txt
 
 -include $(top_srcdir)/git.mk
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 0686bc1..f694c02 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -10,21 +10,21 @@ DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
 SCAN_OPTIONS=
 
 # Files/directories to ignore when scanning.
-IGNORE_HFILES=					\
-	config.h				\
-	config-defines.h			\
-	config-renaming.h			\
-	Evolution-Addressbook-SelectNames.h	\
-	connector-public-key.h			\
-	e2k-marshal.h				\
-	e2k-propnames.h				\
-	e2k-proptags.h				\
-	e2k-types.h				\
-	addressbook				\
-	calendar				\
-	camel					\
-	mail					\
-	shell					\
+IGNORE_HFILES= \
+	config.h \
+	config-defines.h \
+	config-renaming.h \
+	Evolution-Addressbook-SelectNames.h \
+	connector-public-key.h \
+	e2k-marshal.h \
+	e2k-propnames.h \
+	e2k-proptags.h \
+	e2k-types.h \
+	addressbook \
+	calendar \
+	camel \
+	mail \
+	shell \
 	storage
 
 # The directory containing the source code. Relative to $(srcdir)
@@ -35,14 +35,14 @@ CFILE_GLOB=$(top_srcdir)/*/*.c
 
 # CFLAGS and LDFLAGS for compiling scan program. Only needed
 # if $(DOC_MODULE).types is non-empty.
-INCLUDES =					\
-	-I$(top_srcdir)/lib			\
-	-I$(top_builddir)/lib			\
-	$(LIBEXCHANGE_CFLAGS)			\
+INCLUDES = \
+	-I$(top_srcdir)/lib \
+	-I$(top_builddir)/lib \
+	$(LIBEXCHANGE_CFLAGS) \
 	$(LDAP_CFLAGS)
 
-GTKDOC_LIBS =					\
-	$(LIBEXCHANGE_LIBS)			\
+GTKDOC_LIBS = \
+	$(LIBEXCHANGE_LIBS) \
 	$(LDAP_LIBS)
 
 # Extra options to supply to gtkdoc-mkdb
@@ -60,12 +60,11 @@ FIXXREF_OPTIONS=
 include gtk-doc.make
 
 # Other files to distribute
-EXTRA_DIST +=					\
+EXTRA_DIST += \
 	gtk-doc.make
 
 dist-hook-local:
 	mkdir $(distdir)/features
 	-cp $(srcdir)/features/*.xml $(distdir)/features
 
-
 -include $(top_srcdir)/git.mk
diff --git a/mail/Makefile.am b/mail/Makefile.am
index b263bc6..55afa90 100644
--- a/mail/Makefile.am
+++ b/mail/Makefile.am
@@ -1,26 +1,26 @@
 ## Process this file with automake to produce Makefile.in
-noinst_LTLIBRARIES =						\
+noinst_LTLIBRARIES = \
 	libexchangemail.la
 
-AM_CPPFLAGS =							\
-	-I$(top_srcdir)						\
-	-I$(top_srcdir)/camel					\
-	-I$(top_srcdir)/storage  				\
-	-DG_LOG_DOMAIN=\"exchange-mail\"			\
-	$(EXTRA_GNOME_CFLAGS)					\
-	$(BONOBO_GNOME_CFLAGS)					\
-	$(MAIL_CFLAGS)						\
-	$(LIBEXCHANGE_CFLAGS)					\
-	$(LDAP_CFLAGS)						
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/camel \
+	-I$(top_srcdir)/storage   \
+	-DG_LOG_DOMAIN=\"exchange-mail\" \
+	$(EXTRA_GNOME_CFLAGS) \
+	$(BONOBO_GNOME_CFLAGS) \
+	$(MAIL_CFLAGS) \
+	$(LIBEXCHANGE_CFLAGS) \
+	$(LDAP_CFLAGS)
 
-libexchangemail_la_SOURCES =					\
-	mail-stub.c						\
-	mail-stub.h						\
-	mail-stub-listener.c					\
-	mail-stub-listener.h					\
-	mail-stub-exchange.c					\
-	mail-stub-exchange.h					\
-	mail-utils.c						\
+libexchangemail_la_SOURCES = \
+	mail-stub.c \
+	mail-stub.h \
+	mail-stub-listener.c \
+	mail-stub-listener.h \
+	mail-stub-exchange.c \
+	mail-stub-exchange.h \
+	mail-utils.c \
 	mail-utils.h
 
 -include $(top_srcdir)/git.mk
diff --git a/storage/Makefile.am b/storage/Makefile.am
index c12af73..20f3cd9 100644
--- a/storage/Makefile.am
+++ b/storage/Makefile.am
@@ -1,63 +1,63 @@
-AM_CPPFLAGS =							\
-	-I$(top_srcdir)						\
-	-I$(top_srcdir)/mail					\
-	-I$(top_srcdir)/camel					\
-	-I$(top_srcdir)/calendar				\
-	-DG_LOG_DOMAIN=\"evolution-exchange-storage\"		\
-	$(LIBEXCHANGE_CFLAGS)				\
-	$(EXCHANGE_STORAGE_CFLAGS)				\
-	$(LDAP_CFLAGS)						\
-	-DPREFIX=\"$(prefix)\"					\
-	-DSYSCONFDIR=\""$(sysconfdir)"\" 			\
-	-DDATADIR=\""$(datadir)"\"	 			\
-	-DLIBDIR=\""$(datadir)"\"	 			\
-	-DCONNECTOR_GLADEDIR=\""$(gladedir)"\"			\
-	-DCONNECTOR_IMAGESDIR=\""$(imagesdir)"\"		\
-	-DCONNECTOR_UIDIR=\""$(uidir)"\"			\
+AM_CPPFLAGS = \
+	-I$(top_srcdir) \
+	-I$(top_srcdir)/mail \
+	-I$(top_srcdir)/camel \
+	-I$(top_srcdir)/calendar \
+	-DG_LOG_DOMAIN=\"evolution-exchange-storage\" \
+	$(LIBEXCHANGE_CFLAGS) \
+	$(EXCHANGE_STORAGE_CFLAGS) \
+	$(LDAP_CFLAGS) \
+	-DPREFIX=\"$(prefix)\" \
+	-DSYSCONFDIR=\""$(sysconfdir)"\"  \
+	-DDATADIR=\""$(datadir)"\"	  \
+	-DLIBDIR=\""$(datadir)"\"	  \
+	-DCONNECTOR_GLADEDIR=\""$(gladedir)"\" \
+	-DCONNECTOR_IMAGESDIR=\""$(imagesdir)"\" \
+	-DCONNECTOR_UIDIR=\""$(uidir)"\" \
 	-DCONNECTOR_LOCALEDIR=\""$(localedir)\""
 
-EVOLUTION_privlibexec_PROGRAMS =				\
+EVOLUTION_privlibexec_PROGRAMS = \
 	evolution-exchange-storage
 
-noinst_PROGRAMS =						\
-	exchange-connector-setup				\
+noinst_PROGRAMS = \
+	exchange-connector-setup \
 	migr-test
 
-evolution_exchange_storage_SOURCES =				\
-	exchange-autoconfig-wizard.c				\
-	exchange-autoconfig-wizard.h				\
-	exchange-component.c					\
-	exchange-component.h					\
-	exchange-config-listener.c				\
-	exchange-config-listener.h				\
-	exchange-change-password.c				\
-	exchange-change-password.h				\
-	exchange-migrate.c					\
-	exchange-migrate.h					\
-	exchange-storage.c					\
-	exchange-storage.h					\
-	main.c							
-
-evolution_exchange_storage_LDADD =				\
-	$(top_builddir)/mail/libexchangemail.la 		\
-	$(top_builddir)/addressbook/libexchangeaddressbook.la	\
-	$(top_builddir)/calendar/libexchangecalendar.la		\
-	$(top_builddir)/camel/camel-stub-marshal.lo		\
-	$(LDAP_LIBS)						\
-	$(EXCHANGE_STORAGE_LIBS)				\
-	$(LIBEXCHANGE_LIBS)					\
+evolution_exchange_storage_SOURCES = \
+	exchange-autoconfig-wizard.c \
+	exchange-autoconfig-wizard.h \
+	exchange-component.c \
+	exchange-component.h \
+	exchange-config-listener.c \
+	exchange-config-listener.h \
+	exchange-change-password.c \
+	exchange-change-password.h \
+	exchange-migrate.c \
+	exchange-migrate.h \
+	exchange-storage.c \
+	exchange-storage.h \
+	main.c
+
+evolution_exchange_storage_LDADD = \
+	$(top_builddir)/mail/libexchangemail.la  \
+	$(top_builddir)/addressbook/libexchangeaddressbook.la \
+	$(top_builddir)/calendar/libexchangecalendar.la \
+	$(top_builddir)/camel/camel-stub-marshal.lo \
+	$(LDAP_LIBS) \
+	$(EXCHANGE_STORAGE_LIBS) \
+	$(LIBEXCHANGE_LIBS) \
 	$(SOCKET_LIBS)
 
 
-exchange_connector_setup_SOURCES =				\
-	ximian-connector-setup.c				\
-	exchange-config-listener.c				\
-	exchange-config-listener.h				\
+exchange_connector_setup_SOURCES = \
+	ximian-connector-setup.c \
+	exchange-config-listener.c \
+	exchange-config-listener.h \
 	exchange-autoconfig-wizard.c
 
-exchange_connector_setup_LDADD =				\
-	$(LDAP_LIBS)						\
-	$(EXCHANGE_STORAGE_LIBS)				\
+exchange_connector_setup_LDADD = \
+	$(LDAP_LIBS) \
+	$(EXCHANGE_STORAGE_LIBS) \
 	$(LIBEXCHANGE_LIBS)
 
 install-exec-local: exchange-connector-setup
@@ -67,16 +67,16 @@ install-exec-local: exchange-connector-setup
 uninstall-local:
 	rm -rf $(DESTDIR)$(bindir)/exchange-connector-setup-$(BASE_VERSION)
 
-migr_test_SOURCES =						\
-	migr-test.c						\
-	exchange-config-listener.c				\
-	exchange-config-listener.h				\
-	exchange-migrate.c					\
+migr_test_SOURCES = \
+	migr-test.c \
+	exchange-config-listener.c \
+	exchange-config-listener.h \
+	exchange-migrate.c \
 	exchange-migrate.h
 
-migr_test_LDADD = 						\
-	$(LDAP_LIBS)						\
-	$(EXCHANGE_STORAGE_LIBS)				\
+migr_test_LDADD =  \
+	$(LDAP_LIBS) \
+	$(EXCHANGE_STORAGE_LIBS) \
 	$(LIBEXCHANGE_LIBS)
 
 serverdir = $(libdir)/bonobo/servers
@@ -90,43 +90,43 @@ CONNECTOR_PATH_IN_SERVER_FILE=${EVOLUTION_privlibexecdir}
 endif
 
 %_$(BASE_VERSION).server.in: %.server.in.in
-	sed -e "s;\ CONNECTOR_PATH\@;${CONNECTOR_PATH_IN_SERVER_FILE};g"	\
-	    -e "s;\ IMAGESDIR\@;${imagesdir};g"				\
-	    -e "s;\ BASE_VERSION\@;${BASE_VERSION};g"			\
-	    -e "s;\ EXEEXT\@;${EXEEXT};g"				\
-	    -e "s;\ API_VERSION\@;${API_VERSION};g"			\
-	    -e "s;\ EDS_BASE_VERSION\@;${EDS_BASE_VERSION};g"		\
+	sed -e "s; \ CONNECTOR_PATH \@;${CONNECTOR_PATH_IN_SERVER_FILE};g" \
+	    -e "s; \ IMAGESDIR \@;${imagesdir};g" \
+	    -e "s; \ BASE_VERSION \@;${BASE_VERSION};g" \
+	    -e "s; \ EXEEXT \@;${EXEEXT};g" \
+	    -e "s; \ API_VERSION \@;${API_VERSION};g" \
+	    -e "s; \ EDS_BASE_VERSION \@;${EDS_BASE_VERSION};g" \
 	    < $< > $@
 
 @INTLTOOL_SERVER_RULE@
 
 imagesdir = $(CONNECTOR_DATADIR)/images
-images_DATA =				\
-	connector.png			\
-	connector-mini.png		\
-	exchange-delegates-48.png	\
+images_DATA = \
+	connector.png \
+	connector-mini.png \
+	exchange-delegates-48.png \
 	exchange-oof-48.png
 
 gladedir   = $(CONNECTOR_DATADIR)/glade
-glade_DATA =					\
-	exchange-autoconfig-wizard.glade	\
-	exchange-change-password.glade		\
-	exchange-delegates.glade		\
-	exchange-oof.glade			\
-	exchange-permissions-dialog.glade	\
-	exchange-folder-tree.glade		\
+glade_DATA = \
+	exchange-autoconfig-wizard.glade \
+	exchange-change-password.glade \
+	exchange-delegates.glade \
+	exchange-oof.glade \
+	exchange-permissions-dialog.glade \
+	exchange-folder-tree.glade \
 	exchange-passwd-expiry.glade
 
 uidir   = $(CONNECTOR_DATADIR)/ui
 ui_DATA = ximian-connector.xml
 
-DISTCLEANFILES = \
+DISTCLEANFILES =  \
 	$(server_DATA)
 
-EXTRA_DIST =				\
-	$(server_in_files)		\
-	$(images_DATA)			\
-	$(glade_DATA)			\
+EXTRA_DIST = \
+	$(server_in_files) \
+	$(images_DATA) \
+	$(glade_DATA) \
 	$(ui_DATA)
 
 -include $(top_srcdir)/git.mk
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]