diff options
| author | Jody Goldberg <jody@gnome.org> | 2004-01-09 07:41:19 +0000 |
|---|---|---|
| committer | Jody Goldberg <jody@src.gnome.org> | 2004-01-09 07:41:19 +0000 |
| commit | 71a35716bd06c3b300eb843dde875ddff149f4b1 (patch) | |
| tree | b5cc511e63023d2e43afc05caabe813f340b5dd7 /gnome-settings-daemon | |
| parent | 749a17a4005991a099ef267e52ac5fecc09a43cd (diff) | |
| download | gnome-control-center-71a35716bd06c3b300eb843dde875ddff149f4b1.tar.gz | |
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
Diffstat (limited to 'gnome-settings-daemon')
| -rw-r--r-- | gnome-settings-daemon/ChangeLog | 7 | ||||
| -rw-r--r-- | gnome-settings-daemon/GNOME_SettingsDaemon.server.in (renamed from gnome-settings-daemon/GNOME_SettingsDaemon.server.in.in) | 0 | ||||
| -rw-r--r-- | gnome-settings-daemon/Makefile.am | 24 |
3 files changed, 15 insertions, 16 deletions
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.in b/gnome-settings-daemon/GNOME_SettingsDaemon.server.in index aacf3a6ab..aacf3a6ab 100644 --- a/gnome-settings-daemon/GNOME_SettingsDaemon.server.in.in +++ b/gnome-settings-daemon/GNOME_SettingsDaemon.server.in 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) |