diff options
Diffstat (limited to 'capplets')
-rw-r--r-- | capplets/about-me/Makefile.am | 2 | ||||
-rw-r--r-- | capplets/about-me/mate-about-me.desktop.in (renamed from capplets/about-me/mate-about-me.desktop.in.in) | 0 | ||||
-rw-r--r-- | capplets/accessibility/at-properties/Makefile.am | 4 | ||||
-rw-r--r-- | capplets/accessibility/at-properties/mate-at-properties.desktop.in (renamed from capplets/accessibility/at-properties/mate-at-properties.desktop.in.in) | 0 | ||||
-rw-r--r-- | capplets/appearance/data/Makefile.am | 5 | ||||
-rw-r--r-- | capplets/appearance/data/mate-appearance-properties.desktop.in (renamed from capplets/appearance/data/mate-appearance-properties.desktop.in.in) | 0 | ||||
-rw-r--r-- | capplets/appearance/data/mate-theme-installer.desktop.in (renamed from capplets/appearance/data/mate-theme-installer.desktop.in.in) | 0 | ||||
-rw-r--r-- | capplets/default-applications/Makefile.am | 4 | ||||
-rw-r--r-- | capplets/default-applications/mate-default-applications-properties.desktop.in (renamed from capplets/default-applications/mate-default-applications-properties.desktop.in.in) | 0 | ||||
-rw-r--r-- | capplets/display/Makefile.am | 4 | ||||
-rw-r--r-- | capplets/display/mate-display-properties.desktop.in (renamed from capplets/display/mate-display-properties.desktop.in.in) | 0 | ||||
-rw-r--r-- | capplets/keybindings/Makefile.am | 3 | ||||
-rw-r--r-- | capplets/keybindings/mate-keybinding.desktop.in (renamed from capplets/keybindings/mate-keybinding.desktop.in.in) | 0 | ||||
-rw-r--r-- | capplets/keyboard/Makefile.am | 4 | ||||
-rw-r--r-- | capplets/keyboard/mate-keyboard.desktop.in (renamed from capplets/keyboard/mate-keyboard.desktop.in.in) | 0 | ||||
-rw-r--r-- | capplets/mouse/Makefile.am | 4 | ||||
-rw-r--r-- | capplets/mouse/mate-settings-mouse.desktop.in (renamed from capplets/mouse/mate-settings-mouse.desktop.in.in) | 0 | ||||
-rw-r--r-- | capplets/network/Makefile.am | 3 | ||||
-rw-r--r-- | capplets/network/mate-network-properties.desktop.in (renamed from capplets/network/mate-network-properties.desktop.in.in) | 0 | ||||
-rw-r--r-- | capplets/windows/Makefile.am | 3 | ||||
-rw-r--r-- | capplets/windows/mate-window-properties.desktop.in (renamed from capplets/windows/mate-window-properties.desktop.in.in) | 0 |
21 files changed, 18 insertions, 18 deletions
diff --git a/capplets/about-me/Makefile.am b/capplets/about-me/Makefile.am index f510c81f..2dc847fb 100644 --- a/capplets/about-me/Makefile.am +++ b/capplets/about-me/Makefile.am @@ -48,6 +48,6 @@ AM_CPPFLAGS = \ -DMATELOCALEDIR="\"$(datadir)/locale\"" CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(MARSHALFILES) -EXTRA_DIST = $(ui_files) fprintd-marshal.list +EXTRA_DIST = $(ui_files) fprintd-marshal.list $(Desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/capplets/about-me/mate-about-me.desktop.in.in b/capplets/about-me/mate-about-me.desktop.in index 71d3f704..71d3f704 100644 --- a/capplets/about-me/mate-about-me.desktop.in.in +++ b/capplets/about-me/mate-about-me.desktop.in diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am index 178a3165..2af0ca50 100644 --- a/capplets/accessibility/at-properties/Makefile.am +++ b/capplets/accessibility/at-properties/Makefile.am @@ -25,7 +25,7 @@ AM_CPPFLAGS = $(AT_CAPPLET_CFLAGS) \ -DPIXMAPDIR=\""$(pixmapdir)"\" \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DMATELOCALEDIR="\"$(datadir)/locale\"" -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) -EXTRA_DIST = $(ui_DATA) $(pixmap_DATA) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) +EXTRA_DIST = $(ui_DATA) $(pixmap_DATA) $(Desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in b/capplets/accessibility/at-properties/mate-at-properties.desktop.in index e07d332a..e07d332a 100644 --- a/capplets/accessibility/at-properties/mate-at-properties.desktop.in.in +++ b/capplets/accessibility/at-properties/mate-at-properties.desktop.in diff --git a/capplets/appearance/data/Makefile.am b/capplets/appearance/data/Makefile.am index ff85ab63..4bec1621 100644 --- a/capplets/appearance/data/Makefile.am +++ b/capplets/appearance/data/Makefile.am @@ -47,9 +47,8 @@ if ENABLE_UPDATE_MIMEDB $(UPDATE_MIME_DATABASE) "$(DESTDIR)$(datadir)/mime" endif -EXTRA_DIST = $(xml_in_files) +EXTRA_DIST = $(xml_in_files) $(desktop_in_files) - -CLEANFILES = $(desktop_in_files) $(desktop_DATA) $(mime_DATA) +CLEANFILES = $(desktop_DATA) $(mime_DATA) -include $(top_srcdir)/git.mk diff --git a/capplets/appearance/data/mate-appearance-properties.desktop.in.in b/capplets/appearance/data/mate-appearance-properties.desktop.in index b984155a..b984155a 100644 --- a/capplets/appearance/data/mate-appearance-properties.desktop.in.in +++ b/capplets/appearance/data/mate-appearance-properties.desktop.in diff --git a/capplets/appearance/data/mate-theme-installer.desktop.in.in b/capplets/appearance/data/mate-theme-installer.desktop.in index 0c9fc718..0c9fc718 100644 --- a/capplets/appearance/data/mate-theme-installer.desktop.in.in +++ b/capplets/appearance/data/mate-theme-installer.desktop.in diff --git a/capplets/default-applications/Makefile.am b/capplets/default-applications/Makefile.am index 96d979c2..756018fe 100644 --- a/capplets/default-applications/Makefile.am +++ b/capplets/default-applications/Makefile.am @@ -26,7 +26,7 @@ AM_CPPFLAGS = \ -DMATELOCALEDIR=\""$(datadir)/locale"\"\ -DMATECC_UI_DIR=\""$(uidir)"\" -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) $(autostart_DATA) -EXTRA_DIST = mate-default-applications.pc.in mate-default-applications-properties.desktop.in.in +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) $(autostart_DATA) +EXTRA_DIST = mate-default-applications.pc.in $(Desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/capplets/default-applications/mate-default-applications-properties.desktop.in.in b/capplets/default-applications/mate-default-applications-properties.desktop.in index 072dd304..072dd304 100644 --- a/capplets/default-applications/mate-default-applications-properties.desktop.in.in +++ b/capplets/default-applications/mate-default-applications-properties.desktop.in diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am index 4a304a97..d442fe6f 100644 --- a/capplets/display/Makefile.am +++ b/capplets/display/Makefile.am @@ -58,7 +58,7 @@ AM_CPPFLAGS = $(DISPLAY_CAPPLET_CFLAGS) \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor install-data-hook: update-icon-cache @@ -72,7 +72,7 @@ update-icon-cache: echo "*** $(gtk_update_icon_cache)"; \ fi -EXTRA_DIST = org.mate.randr.policy.in +EXTRA_DIST = org.mate.randr.policy.in $(Desktop_in_files) DISTCLEANFILES = org.mate.randr.policy -include $(top_srcdir)/git.mk diff --git a/capplets/display/mate-display-properties.desktop.in.in b/capplets/display/mate-display-properties.desktop.in index 324529fa..324529fa 100644 --- a/capplets/display/mate-display-properties.desktop.in.in +++ b/capplets/display/mate-display-properties.desktop.in diff --git a/capplets/keybindings/Makefile.am b/capplets/keybindings/Makefile.am index 09a0b1fc..e5efb109 100644 --- a/capplets/keybindings/Makefile.am +++ b/capplets/keybindings/Makefile.am @@ -37,10 +37,9 @@ AM_CPPFLAGS = \ -DMATECC_KEYBINDINGS_DIR="\"$(pkgdatadir)/keybindings\"" CLEANFILES = \ $(MATECC_CAPPLETS_CLEANFILES) \ - $(Desktop_in_files) \ $(desktop_DATA) \ $(xml_DATA) -EXTRA_DIST = $(ui_DATA) $(xml_in_files) mate-keybindings.pc.in +EXTRA_DIST = $(ui_DATA) $(xml_in_files) mate-keybindings.pc.in $(Desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/capplets/keybindings/mate-keybinding.desktop.in.in b/capplets/keybindings/mate-keybinding.desktop.in index d154d342..d154d342 100644 --- a/capplets/keybindings/mate-keybinding.desktop.in.in +++ b/capplets/keybindings/mate-keybinding.desktop.in diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am index 0b48fbbd..b1a7c5af 100644 --- a/capplets/keyboard/Makefile.am +++ b/capplets/keyboard/Makefile.am @@ -36,7 +36,7 @@ AM_CPPFLAGS = \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DMATECC_UI_DIR="\"$(uidir)\"" -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) -EXTRA_DIST = $(ui_DATA) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) +EXTRA_DIST = $(ui_DATA) $(Desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/capplets/keyboard/mate-keyboard.desktop.in.in b/capplets/keyboard/mate-keyboard.desktop.in index 5f366a65..5f366a65 100644 --- a/capplets/keyboard/mate-keyboard.desktop.in.in +++ b/capplets/keyboard/mate-keyboard.desktop.in diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am index 1e413215..f7507ce8 100644 --- a/capplets/mouse/Makefile.am +++ b/capplets/mouse/Makefile.am @@ -29,7 +29,7 @@ AM_CPPFLAGS = \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DMATECC_DATA_DIR="\"$(pkgdatadir)\"" \ -DMATECC_UI_DIR="\"$(uidir)\"" -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) -EXTRA_DIST = $(ui_DATA) $(pixmap_DATA) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) +EXTRA_DIST = $(ui_DATA) $(pixmap_DATA) $(Desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/capplets/mouse/mate-settings-mouse.desktop.in.in b/capplets/mouse/mate-settings-mouse.desktop.in index d309131e..d309131e 100644 --- a/capplets/mouse/mate-settings-mouse.desktop.in.in +++ b/capplets/mouse/mate-settings-mouse.desktop.in diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am index 6ec1e224..e0e934a1 100644 --- a/capplets/network/Makefile.am +++ b/capplets/network/Makefile.am @@ -45,6 +45,7 @@ update-icon-cache: echo "*** $(gtk_update_icon_cache)"; \ fi -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_in_files) $(desktop_DATA) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) +EXTRA_DIST = $(desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/capplets/network/mate-network-properties.desktop.in.in b/capplets/network/mate-network-properties.desktop.in index f6d135bf..f6d135bf 100644 --- a/capplets/network/mate-network-properties.desktop.in.in +++ b/capplets/network/mate-network-properties.desktop.in diff --git a/capplets/windows/Makefile.am b/capplets/windows/Makefile.am index 4b0fe063..cf1b9307 100644 --- a/capplets/windows/Makefile.am +++ b/capplets/windows/Makefile.am @@ -21,6 +21,7 @@ AM_CPPFLAGS = $(MATECC_CAPPLETS_CFLAGS) \ -DMATELOCALEDIR="\"$(datadir)/locale\"" \ -DPIXMAPDIR=\""$(pixmapdir)"\" -CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(Desktop_in_files) $(desktop_DATA) +CLEANFILES = $(MATECC_CAPPLETS_CLEANFILES) $(desktop_DATA) +EXTRA_DIST = $(Desktop_in_files) -include $(top_srcdir)/git.mk diff --git a/capplets/windows/mate-window-properties.desktop.in.in b/capplets/windows/mate-window-properties.desktop.in index 49d2bc76..49d2bc76 100644 --- a/capplets/windows/mate-window-properties.desktop.in.in +++ b/capplets/windows/mate-window-properties.desktop.in |