Move desktop files into data/

Move desktop files into data/ subdirectory, so that they not clutter
the top source dir.

10 files changed, 26 insertions, 26 deletions

diff --git a/Makefile.am b/Makefile.am
index 194e1c706..0522c2fe8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,18 +1,5 @@
 include $(top_srcdir)/Makefile.shared
 
-@INTLTOOL_DESKTOP_RULE@
-
-desktopdir       = $(datadir)/applications
-desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
-desktop_in_files = 					\
-	nautilus.desktop.in				\
-	nautilus-home.desktop.in			\
-	nautilus-computer.desktop.in			\
-	nautilus-folder-handler.desktop.in		\
-	nautilus-file-management-properties.desktop.in  \
-	nautilus-browser.desktop.in                     \
-	nautilus-autorun-software.desktop.in
-
 SUBDIRS =			\
 	eel			\
 	libnautilus-extension	\
@@ -47,11 +34,8 @@ EXTRA_DIST=					\
 	intltool-update.in			\
 	Makefile.shared				\
 	add-include-prefix			\
-	$(desktop_in_files)			\
 	$(NULL)
 
-CLEANFILES = $(desktop_DATA)
-
 DISTCLEANFILES = \
   intltool-extract \
   intltool-merge \
diff --git a/configure.in b/configure.in
index 54f47e21a..bad35e76e 100644
--- a/configure.in
+++ b/configure.in
@@ -472,6 +472,13 @@ cut-n-paste-code/libegg/Makefile
 data/Makefile
 data/icons/Makefile
 data/patterns/Makefile
+data/nautilus-computer.desktop.in
+data/nautilus-file-management-properties.desktop.in
+data/nautilus-home.desktop.in
+data/nautilus.desktop.in
+data/nautilus-folder-handler.desktop.in
+data/nautilus-browser.desktop.in
+data/nautilus-autorun-software.desktop.in
 docs/Makefile
 docs/reference/Makefile
 docs/reference/libnautilus-extension/Makefile
@@ -482,13 +489,6 @@ libnautilus-private/Makefile
 libnautilus-extension/Makefile
 libnautilus-extension/libnautilus-extension.pc
 libnautilus-extension/libnautilus-extension-uninstalled.pc
-nautilus-computer.desktop.in
-nautilus-file-management-properties.desktop.in
-nautilus-home.desktop.in
-nautilus.desktop.in
-nautilus-folder-handler.desktop.in
-nautilus-browser.desktop.in
-nautilus-autorun-software.desktop.in
 po/Makefile.in
 src/Makefile
 src/file-manager/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 293441139..4d6a2222b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,6 +4,19 @@ xml_in_files = nautilus.xml.in
 xml_files = $(xml_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
+@INTLTOOL_DESKTOP_RULE@
+
+desktopdir       = $(datadir)/applications
+desktop_DATA     = $(desktop_in_files:.desktop.in=.desktop)
+desktop_in_files = 					\
+	nautilus.desktop.in				\
+	nautilus-home.desktop.in			\
+	nautilus-computer.desktop.in			\
+	nautilus-folder-handler.desktop.in		\
+	nautilus-file-management-properties.desktop.in  \
+	nautilus-browser.desktop.in                     \
+	nautilus-autorun-software.desktop.in
+
 mimedir = $(datadir)/mime/packages
 mime_DATA = $(xml_files)
 
@@ -15,11 +28,14 @@ nautilusdata_DATA = \
 	nautilus-suggested.placeholder 	\
 	$(NULL)
 
-EXTRA_DIST = $(nautilusdata_DATA) \
-	$(xml_in_files) \
+EXTRA_DIST = $(nautilusdata_DATA) 	\
+	$(xml_in_files) 		\
+	$(desktop_in_files)		\
 	$(NULL)
 
-CLEANFILES = $(xml_files)
+CLEANFILES = $(xml_files)	\
+	$(desktop_DATA)		\
+	$(NULL)
 
 SUBDIRS = \
 	icons    \
diff --git a/nautilus-autorun-software.desktop.in.in b/data/nautilus-autorun-software.desktop.in.in
index b3c48ef2c..b3c48ef2c 100644
--- a/nautilus-autorun-software.desktop.in.in
+++ b/data/nautilus-autorun-software.desktop.in.in
diff --git a/nautilus-browser.desktop.in.in b/data/nautilus-browser.desktop.in.in
index ef7d18da1..ef7d18da1 100644
--- a/nautilus-browser.desktop.in.in
+++ b/data/nautilus-browser.desktop.in.in
diff --git a/nautilus-computer.desktop.in.in b/data/nautilus-computer.desktop.in.in
index aed78eeb1..aed78eeb1 100644
--- a/nautilus-computer.desktop.in.in
+++ b/data/nautilus-computer.desktop.in.in
diff --git a/nautilus-file-management-properties.desktop.in.in b/data/nautilus-file-management-properties.desktop.in.in
index a696c8181..a696c8181 100644
--- a/nautilus-file-management-properties.desktop.in.in
+++ b/data/nautilus-file-management-properties.desktop.in.in
diff --git a/nautilus-folder-handler.desktop.in.in b/data/nautilus-folder-handler.desktop.in.in
index ce89ed75b..ce89ed75b 100644
--- a/nautilus-folder-handler.desktop.in.in
+++ b/data/nautilus-folder-handler.desktop.in.in
diff --git a/nautilus-home.desktop.in.in b/data/nautilus-home.desktop.in.in
index c84218129..c84218129 100644
--- a/nautilus-home.desktop.in.in
+++ b/data/nautilus-home.desktop.in.in
diff --git a/nautilus.desktop.in.in b/data/nautilus.desktop.in.in
index d3aa07709..d3aa07709 100644
--- a/nautilus.desktop.in.in
+++ b/data/nautilus.desktop.in.in