From 71a35716bd06c3b300eb843dde875ddff149f4b1 Mon Sep 17 00:00:00 2001
From: Jody Goldberg <jody@gnome.org>
Date: Fri, 9 Jan 2004 07:41:19 +0000
Subject: 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                    |  7 +++++++
 .../GNOME_SettingsDaemon.server.in                 |  9 ++++++++
 .../GNOME_SettingsDaemon.server.in.in              |  9 --------
 gnome-settings-daemon/Makefile.am                  | 24 ++++++++--------------
 4 files changed, 24 insertions(+), 25 deletions(-)
 create mode 100644 gnome-settings-daemon/GNOME_SettingsDaemon.server.in
 delete mode 100644 gnome-settings-daemon/GNOME_SettingsDaemon.server.in.in

(limited to 'gnome-settings-daemon')

diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index 22419a24f..009abcdff 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/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
diff --git a/gnome-settings-daemon/GNOME_SettingsDaemon.server.in b/gnome-settings-daemon/GNOME_SettingsDaemon.server.in
new file mode 100644
index 000000000..aacf3a6ab
--- /dev/null
+++ b/gnome-settings-daemon/GNOME_SettingsDaemon.server.in
@@ -0,0 +1,9 @@
+<oaf_info>
+  <oaf_server iid="OAFIID:GNOME_SettingsDaemon"
+	      type="exe" location="@LIBEXECDIR@/gnome-settings-daemon">
+    <oaf_attribute name="repo_ids" type="stringv">
+      <item value="IDL:Bonobo/Unknown:1.0"/>
+      <item value="IDL:GNOME/SettingsDaemon:1.0"/>
+    </oaf_attribute>
+  </oaf_server>
+</oaf_info>
diff --git a/gnome-settings-daemon/GNOME_SettingsDaemon.server.in.in b/gnome-settings-daemon/GNOME_SettingsDaemon.server.in.in
deleted file mode 100644
index aacf3a6ab..000000000
--- a/gnome-settings-daemon/GNOME_SettingsDaemon.server.in.in
+++ /dev/null
@@ -1,9 +0,0 @@
-<oaf_info>
-  <oaf_server iid="OAFIID:GNOME_SettingsDaemon"
-	      type="exe" location="@LIBEXECDIR@/gnome-settings-daemon">
-    <oaf_attribute name="repo_ids" type="stringv">
-      <item value="IDL:Bonobo/Unknown:1.0"/>
-      <item value="IDL:GNOME/SettingsDaemon:1.0"/>
-    </oaf_attribute>
-  </oaf_server>
-</oaf_info>
diff --git a/gnome-settings-daemon/Makefile.am b/gnome-settings-daemon/Makefile.am
index 9c24fbea9..2d385a53e 100644
--- a/gnome-settings-daemon/Makefile.am
+++ b/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)
-
-$(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
+serverfile = GNOME_SettingsDaemon.server.in
+serverdir = $(libdir)/bonobo/servers
+install-data-hook :
+	$(mkinstalldirs) $(serverdir)
+	sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $(srcdir)/$(serverfile) > $(serverdir)/$(serverfile:.in=)
+
+EXTRA_DIST = $(serverfile)
+CLEANFILES = $(BUILT_SOURCES)
-- 
cgit v1.2.1