simplify and generate the file at the last possible instant. CLickety

2004-01-09  Jody Goldberg <jody@gnome.org>

	* Makefile.am : simplify and generate the file at the last possible
	  instant.  CLickety Click, no mor eworries about tmp files.
	* GNOME_SettingsDaemon.server.in: restore
	* GNOME_SettingsDaemon.server.in.in: remove

gnome-settings-daemon/ChangeLog

@@ -1,3 +1,10 @@
+2004-01-09  Jody Goldberg <jody@gnome.org>
+
+	* Makefile.am : simplify and generate the file at the last possible
+	  instant.  CLickety Click, no mor eworries about tmp files.
+	* GNOME_SettingsDaemon.server.in: restore
+	* GNOME_SettingsDaemon.server.in.in: remove
+
 2004-01-08  Glynn Foster  <glynn.foster@sun.com>
 
 	* GNOME_SettingsDaemon.server.in: Remove from CVS since it's

gnome-settings-daemon/Makefile.am

@@ -84,19 +84,11 @@ IDL_FLAGS = -D__GNOME_SettingsDaemon_COMPILATION -I $(idl_dir) -I $(datadir)/idl
 $(CORBA_GENERATED): $(idl_dir)/GNOME_SettingsDaemon.idl $(ORBIT_IDL)
 	$(ORBIT_IDL) $(IDL_FLAGS) $(idl_dir)/GNOME_SettingsDaemon.idl
 
-serverdir	= $(libdir)/bonobo/servers
-server_in_files = GNOME_SettingsDaemon.server.in
-server_DATA     = $(server_in_files:.server.in=.server)
+serverfile = GNOME_SettingsDaemon.server.in
+serverdir = $(libdir)/bonobo/servers
+install-data-hook :
+	$(mkinstalldirs) $(serverdir)
+	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $(srcdir)/$(serverfile) > $(serverdir)/$(serverfile:.in=)
 
-$(server_in_files): $(server_in_files).in
-	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-
-# Do not ship
-dist-hook :
-	-rm -f $(distdir)/GNOME_SettingsDaemon.server.in $(distdir)/GNOME_SettingsDaemon.server
-
-@INTLTOOL_SERVER_RULE@
-
-CLEANFILES = $(BUILT_SOURCES) $(server_in_files)
-
-EXTRA_DIST = $(server_in_files)	GNOME_SettingsDaemon.server.in.in
+EXTRA_DIST = $(serverfile)
+CLEANFILES = $(BUILT_SOURCES)