[evolution-patches] 42691 (all modules), make distclean not properly resetting .server files

[Not Zed <notzed ximian com>]

This fixes 2 things -
 .server files being removed when you do make (dist)clean
 .server.in files being generated by an implicit rule, so they are
always immediately deleted automatically during make, and not left
around containing stale data

Index: addressbook/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/ChangeLog,v
retrieving revision 1.1427
diff -u -3 -r1.1427 ChangeLog
--- addressbook/ChangeLog	19 May 2003 20:30:22 -0000	1.1427
+++ addressbook/ChangeLog	5 Jun 2003 07:44:25 -0000
@@ -1,3 +1,18 @@
+2003-06-05  Not Zed  <NotZed Ximian com>
+
+	** For #42691.
+
+	* gui/component/select-names/Makefile.am (%.server.in): implicit
+	rule for .in file.
+	(BUILT_SOURCES): added server_DATA.
+
+	* gui/component/Makefile.am (%.server.in): use implicit rule for
+	.in file.
+	(BUILT_SOURCES): added, just server_DATA.
+	(CLEANFILES): added
+
+	* backend/ebook/Makefile.am (BUILT_SOURCES): add server_DATA.
+
 2003-05-19  Chris Toshok  <toshok ximian com>
 
 	* backend/pas/pas-backend-ldap.c (func_beginswith): use the more
Index: addressbook/backend/ebook/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/backend/ebook/Makefile.am,v
retrieving revision 1.65
diff -u -3 -r1.65 Makefile.am
--- addressbook/backend/ebook/Makefile.am	16 May 2003 18:17:27 -0000	1.65
+++ addressbook/backend/ebook/Makefile.am	5 Jun 2003 07:44:25 -0000
@@ -167,7 +167,7 @@
 	$(EVOLUTION_ADDRESSBOOK_LIBS)
 
 
-BUILT_SOURCES = $(CORBA_SOURCE) $(MARSHAL_GENERATED)
+BUILT_SOURCES = $(CORBA_SOURCE) $(MARSHAL_GENERATED) $(server_DATA)
 CLEANFILES    = $(BUILT_SOURCES)
 
 dist-hook:
Index: addressbook/gui/component/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/Makefile.am,v
retrieving revision 1.86
diff -u -3 -r1.86 Makefile.am
--- addressbook/gui/component/Makefile.am	16 May 2003 18:10:53 -0000	1.86
+++ addressbook/gui/component/Makefile.am	5 Jun 2003 07:44:25 -0000
@@ -78,14 +78,16 @@
 	fi
 
 server_in_files = GNOME_Evolution_Addressbook.server.in.in
-
 server_DATA = $(server_in_files:.server.in.in=.server)
-$(server_in_files:.server.in.in=.server.in): $(server_in_files)
+%.server.in: %.server.in.in
 	sed -e "s|\ COMPONENTDIR\@|$(componentdir)|" $< > $@
 
 @INTLTOOL_SERVER_RULE@
 
 glade_DATA = ldap-config.glade
+
+BUILT_SOURCES = $(server_DATA)
+CLEANFILES    = $(BUILT_SOURCES)
 
 EXTRA_DIST =			\
 	$(glade_DATA)		\
Index: addressbook/gui/component/select-names/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/addressbook/gui/component/select-names/Makefile.am,v
retrieving revision 1.41
diff -u -3 -r1.41 Makefile.am
--- addressbook/gui/component/select-names/Makefile.am	18 Apr 2003 21:53:15 -0000	1.41
+++ addressbook/gui/component/select-names/Makefile.am	5 Jun 2003 07:44:25 -0000
@@ -19,7 +19,7 @@
 server_in_files = GNOME_Evolution_Addressbook_SelectNames.server.in.in
 
 server_DATA = $(server_in_files:.server.in.in=.server)
-$(server_in_files:.server.in.in=.server.in): $(server_in_files)
+%.server.in: %.server.in.in
 	sed -e "s|\ COMPONENTDIR\@|$(componentdir)|" $< > $@
 
 @INTLTOOL_SERVER_RULE@
@@ -108,7 +108,7 @@
 	$(etspec_DATA)		\
 	e-select-names-marshal.list
 
-BUILT_SOURCES = $(IDL_GENERATED) $(MARSHAL_GENERATED)
+BUILT_SOURCES = $(IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA)
 CLEANFILES = $(BUILT_SOURCES)
 
 dist-hook:
Index: calendar/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/calendar/ChangeLog,v
retrieving revision 1.1788
diff -u -3 -r1.1788 ChangeLog
--- calendar/ChangeLog	2 Jun 2003 19:13:44 -0000	1.1788
+++ calendar/ChangeLog	5 Jun 2003 07:44:40 -0000
@@ -1,3 +1,14 @@
+2003-06-05  Not Zed  <NotZed Ximian com>
+
+	** For #42691.
+
+	* gui/Makefile.am (%.server.in): implicit rule for .in file.
+	(BUILT_SOURCES): added server_DATA.
+
+	* gui/alarm-notify/Makefile.am (%.server.in): added implicit rule
+	for .in file.
+	(BUILT_SOURCES): added server_DATA.
+
 2003-06-02  Rodrigo Moya <rodrigo ximian com>
 
 	Fixes part of #43388
Index: calendar/gui/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/Makefile.am,v
retrieving revision 1.267
diff -u -3 -r1.267 Makefile.am
--- calendar/gui/Makefile.am	18 Apr 2003 17:44:19 -0000	1.267
+++ calendar/gui/Makefile.am	5 Jun 2003 07:44:40 -0000
@@ -195,7 +195,7 @@
 server_in_files = GNOME_Evolution_Calendar.server.in.in
 
 server_DATA = $(server_in_files:.server.in.in=.server)
-$(server_in_files:.server.in.in=.server.in): $(server_in_files)
+%.server.in: %.server.in.in
 	sed -e "s|\ COMPONENTDIR\@|$(componentdir)|" $< > $@
 
 # GConf schemas
@@ -211,7 +211,7 @@
 	$(etspec_DATA)			\
 	$(server_in_files)
 
-BUILT_SOURCES = $(IDL_GENERATED)
+BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA)
 CLEANFILES = $(BUILT_SOURCES)
 
 install-data-local:
Index: calendar/gui/alarm-notify/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/calendar/gui/alarm-notify/Makefile.am,v
retrieving revision 1.31
diff -u -3 -r1.31 Makefile.am
--- calendar/gui/alarm-notify/Makefile.am	6 May 2003 13:16:00 -0000	1.31
+++ calendar/gui/alarm-notify/Makefile.am	5 Jun 2003 07:44:40 -0000
@@ -58,7 +58,7 @@
 	GNOME_Evolution_Calendar_AlarmNotify.server.in.in
 
 server_DATA = $(server_in_files:.server.in.in=.server)
-$(server_in_files:.server.in.in=.server.in): $(server_in_files)
+%.server.in: %.server.in.in
 	sed -e "s|\ LIBEXECDIR\@|$(privlibexecdir)|" $< > $@
 
 @INTLTOOL_SERVER_RULE@
@@ -68,7 +68,7 @@
 	$(server_in_files)	\
 	$(glade_DATA)
 
-BUILT_SOURCES = $(CORBA_GENERATED)
+BUILT_SOURCES = $(CORBA_GENERATED) $(server_DATA)
 CLEANFILES = $(BUILT_SOURCES)
 
 dist-hook:
Index: mail/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/mail/ChangeLog,v
retrieving revision 1.2744
diff -u -3 -r1.2744 ChangeLog
--- mail/ChangeLog	3 Jun 2003 20:46:31 -0000	1.2744
+++ mail/ChangeLog	5 Jun 2003 07:44:58 -0000
@@ -1,3 +1,40 @@
+2003-06-05  Not Zed  <NotZed Ximian com>
+
+	** Part of #42691.
+	
+	* importers/Makefile.am (BUILT_SOURCES): added server_DATA.
+
+	* Makefile.am (%.server.in): create a proper implicit rule for
+	temporary .in file.
+
+2003-06-04  Not Zed  <NotZed Ximian com>
+
+	** See bug #43974
+
+	* mail-tools.c (mail_tool_do_movemail): use a proper CamelURL to
+	decode the uri, not hacky strcmp stuff.
+
+	* mail-account-gui.c (extract_values): if we have an conf_entry,
+	ignore username, hostname, and path ones, as these are handled
+	implicitly in the url itself.  Came about because of the fix for
+	#42838.
+
+2003-06-02  Not Zed  <NotZed Ximian com>
+
+	** This and jeffs patch for #43862.
+
+	* mail-folder-cache.c (store_online_cb): If the store is still
+	around, then flow on to a get folderinfo update, otherwise just clear up.
+
+	* mail-ops.c (mail_store_set_offline): return the msgid of this so
+	it can be cancelled.
+
+2003-05-30  Jeffrey Stedfast  <fejj ximian com>
+
+	* mail-folder-cache.c (mail_note_store): If the session is
+	'online' and we are noting a CamelDiscoStore, make sure that it is
+	changed to online status and call mail_get_folderinfo().
+
 2003-06-03  Federico Mena Quintero  <federico ximian com>
 
 	* mail-search.c (mail_search_construct): Put the buttons in HIG
Index: mail/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/mail/Makefile.am,v
retrieving revision 1.210
diff -u -3 -r1.210 Makefile.am
--- mail/Makefile.am	2 Jun 2003 18:14:37 -0000	1.210
+++ mail/Makefile.am	5 Jun 2003 07:44:58 -0000
@@ -174,7 +174,7 @@
 server_in_files = GNOME_Evolution_Mail.server.in.in
 
 server_DATA = $(server_in_files:.server.in.in=.server)
-$(server_in_files:.server.in.in=.server.in): $(server_in_files)
+%.server.in: %.server.in.in
 	sed -e "s|\ COMPONENTDIR\@|$(componentdir)|" $< > $@
 @INTLTOOL_SERVER_RULE@
 
Index: my-evolution/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/my-evolution/ChangeLog,v
retrieving revision 1.289
diff -u -3 -r1.289 ChangeLog
--- my-evolution/ChangeLog	27 May 2003 19:39:44 -0000	1.289
+++ my-evolution/ChangeLog	5 Jun 2003 07:45:00 -0000
@@ -1,3 +1,10 @@
+2003-06-05  Not Zed  <NotZed Ximian com>
+
+	** For #42691.
+
+	* Makefile.am (%.server.in): use implicit rule.
+	(BUILT_SOURCES): added server_DATA
+
 2003-05-27  Ettore Perazzoli  <ettore ximian com>
 
 	* e-summary-tasks.c: New member gconf_value_changed_handler_id in
Index: my-evolution/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/my-evolution/Makefile.am,v
retrieving revision 1.45
diff -u -3 -r1.45 Makefile.am
--- my-evolution/Makefile.am	18 Apr 2003 17:44:28 -0000	1.45
+++ my-evolution/Makefile.am	5 Jun 2003 07:45:00 -0000
@@ -86,7 +86,7 @@
 server_in_files = GNOME_Evolution_Summary.server.in.in
 
 server_DATA = $(server_in_files:.server.in.in=.server)
-$(server_in_files:.server.in.in=.server.in): $(server_in_files)
+%.server.in: %.server.in.in
 	sed -e "s|\ COMPONENTDIR\@|$(componentdir)|" $< > $@
 
 @INTLTOOL_SERVER_RULE@
@@ -123,7 +123,7 @@
 	check-filled.xpm		\
 	check-none.xpm
 
-BUILT_SOURCES = $(IDL_GENERATED)
+BUILT_SOURCES = $(IDL_GENERATED) $(server_DATA)
 CLEANFILES = $(BUILT_SOURCES)
 
 dist-hook:
Index: shell/ChangeLog
===================================================================
RCS file: /cvs/gnome/evolution/shell/ChangeLog,v
retrieving revision 1.1280
diff -u -3 -r1.1280 ChangeLog
--- shell/ChangeLog	22 May 2003 20:39:32 -0000	1.1280
+++ shell/ChangeLog	5 Jun 2003 07:45:10 -0000
@@ -1,3 +1,15 @@
+2003-06-05  Not Zed  <NotZed Ximian com>
+
+	** For #42691.
+
+	* Makefile.am (%.server): use implicit rule.
+	(BUILT_SOURCES): added server_DATA.
+
+2003-05-22  Not Zed  <NotZed Ximian com>
+
+	* e-config-upgrade.c (CONF_MAJOR, CONF_MINOR, CONF_REVISION): Set
+	to 1.4.0 for release.
+
 2003-05-22  Ettore Perazzoli  <ettore ximian com>
 
 	* e-shell-about-box.c: Add Mark Gordon.
Index: shell/Makefile.am
===================================================================
RCS file: /cvs/gnome/evolution/shell/Makefile.am,v
retrieving revision 1.154
diff -u -3 -r1.154 Makefile.am
--- shell/Makefile.am	19 May 2003 19:41:05 -0000	1.154
+++ shell/Makefile.am	5 Jun 2003 07:45:10 -0000
@@ -289,7 +289,7 @@
 
 server_in_files = GNOME_Evolution_Shell.server.in.in
 server_DATA = $(server_in_files:.server.in.in=.server)
-$(server_in_files:.server.in.in=.server.in): $(server_in_files)
+%.server: %.server.in.in
 	sed -e "s|\ BINDIR\@|$(bindir)|"				\
 	    -e "s|\ VERSION\@|$(BASE_VERSION)|"				\
 	    $< > $@
@@ -377,7 +377,7 @@
 
 endif
 
-BUILT_SOURCES = $(IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) $(MARSHAL_GENERATED)
+BUILT_SOURCES = $(IDL_GENERATED) $(SELECT_NAMES_IDL_GENERATED) $(MARSHAL_GENERATED) $(server_DATA)
 CLEANFILES = $(BUILT_SOURCES)
 
 dist-hook: