diff options
| author | Christian Persch <chpe@gnome.org> | 2008-01-30 14:37:55 +0000 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2008-01-30 14:37:55 +0000 |
| commit | c84ac0a45b1d928fd0b0cea4af2b6e245a8e9454 (patch) | |
| tree | 46a188223a9f14c4caef0ba3bbc97aa724b028de /plugins/xsettings | |
| parent | d6eb61bef67b66312e543fcc29849f7a8ba6883c (diff) | |
| download | gnome-settings-daemon-c84ac0a45b1d928fd0b0cea4af2b6e245a8e9454.tar.gz | |
No need to use weird naming of .gnome-settings-daemon.in files. Bug
2008-01-30 Christian Persch <chpe@gnome.org>
* configure.ac:
* plugins/a11y-keyboard/Makefile.am:
* plugins/a11y-keyboard/a11y-keyboard.gnome-settings-plugin.desktop
.in:
* plugins/background/Makefile.am:
* plugins/background/background.gnome-settings-plugin.desktop.in:
* plugins/clipboard/Makefile.am:
* plugins/clipboard/clipboard.gnome-settings-plugin.desktop.in:
* plugins/default-editor/Makefile.am:
* plugins/default-editor/default-editor.gnome-settings-plugin.deskt
op.in:
* plugins/dummy/Makefile.am:
* plugins/dummy/dummy.gnome-settings-plugin.desktop.in:
* plugins/font/Makefile.am:
* plugins/font/font.gnome-settings-plugin.desktop.in:
* plugins/keybindings/Makefile.am:
* plugins/keybindings/keybindings.gnome-settings-plugin.desktop.in:
* plugins/keyboard/Makefile.am:
* plugins/keyboard/keyboard.gnome-settings-plugin.desktop.in:
* plugins/media-keys/Makefile.am:
* plugins/media-keys/media-keys.gnome-settings-plugin.desktop.in:
* plugins/mouse/Makefile.am:
* plugins/mouse/mouse.gnome-settings-plugin.desktop.in:
* plugins/screensaver/Makefile.am:
* plugins/screensaver/screensaver.gnome-settings-plugin.desktop.in:
* plugins/sound/Makefile.am:
* plugins/sound/libsounds/Makefile.am:
* plugins/sound/sound.gnome-settings-plugin.desktop.in:
* plugins/typing-break/Makefile.am:
* plugins/typing-break/typing-break.gnome-settings-plugin.desktop.i
n:
* plugins/xrandr/Makefile.am:
* plugins/xrandr/xrandr.gnome-settings-plugin.desktop.in:
* plugins/xrdb/Makefile.am:
* plugins/xrdb/xrdb.gnome-settings-plugin.desktop.in:
* plugins/xsettings/Makefile.am:
* plugins/xsettings/xsettings.gnome-settings-plugin.desktop.in:
* po/POTFILES.in: No need to use weird naming of
.gnome-settings-daemon.in files. Bug #512048.
svn path=/trunk/; revision=83
Diffstat (limited to 'plugins/xsettings')
| -rw-r--r-- | plugins/xsettings/Makefile.am | 7 | ||||
| -rw-r--r-- | plugins/xsettings/xsettings.gnome-settings-plugin.in (renamed from plugins/xsettings/xsettings.gnome-settings-plugin.desktop.in) | 0 |
2 files changed, 3 insertions, 4 deletions
diff --git a/plugins/xsettings/Makefile.am b/plugins/xsettings/Makefile.am index 151d97c3..5675f270 100644 --- a/plugins/xsettings/Makefile.am +++ b/plugins/xsettings/Makefile.am @@ -38,12 +38,10 @@ libxsettings_la_CFLAGS = \ $(NULL) plugin_in_files = \ - xsettings.gnome-settings-plugin.desktop.in \ + xsettings.gnome-settings-plugin.in \ $(NULL) -%.gnome-settings-plugin: %.gnome-settings-plugin.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache - -plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.desktop.in=.gnome-settings-plugin) +plugin_DATA = $(plugin_in_files:.gnome-settings-plugin.in=.gnome-settings-plugin) EXTRA_DIST = \ $(plugin_in_files) \ @@ -57,3 +55,4 @@ DISTCLEANFILES = \ $(plugin_DATA) \ $(NULL) +@GSD_INTLTOOL_PLUGIN_RULE@ diff --git a/plugins/xsettings/xsettings.gnome-settings-plugin.desktop.in b/plugins/xsettings/xsettings.gnome-settings-plugin.in index eb6a083d..eb6a083d 100644 --- a/plugins/xsettings/xsettings.gnome-settings-plugin.desktop.in +++ b/plugins/xsettings/xsettings.gnome-settings-plugin.in |