[Xfce4-commits] <xfce4-notes-plugin:master> Move xfce4-notes desktop file inside src directory

[Mike Massonnet]

Updating branch refs/heads/master
         to 06528810dcf42bc6b207bbfb9686cd5e3af58b52 (commit)
       from b250521f4ea507348630c1aaab5d6614dbffe1a9 (commit)

commit 06528810dcf42bc6b207bbfb9686cd5e3af58b52
Author: Mike Massonnet <mmassonnet at xfce.org>
Date:   Wed Dec 23 01:41:39 2009 +0100

    Move xfce4-notes desktop file inside src directory

 ChangeLog                                          |    4 ++++
 Makefile.am                                        |    5 -----
 src/Makefile.am                                    |   11 ++++++++++-
 .../xfce4-notes.desktop.in                         |    0
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0a4e92e..a051ac8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-12-23  Mike Massonnet <mmassonnet at xfce.org>
 
+Move xfce4-notes desktop file inside src directory
+
+2009-12-23  Mike Massonnet <mmassonnet at xfce.org>
+
 Rename panel-plugin to src
 
 2009-12-22  Mike Massonnet <mmassonnet at xfce.org>
diff --git a/Makefile.am b/Makefile.am
index cc0398e..17b2a27 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,11 +9,6 @@ SUBDIRS =								\
 distclean-local:
 	rm -rf *.cache *~
 
-desktopdir = $(datadir)/applications
-desktop_in_files = xfce4-notes.desktop.in
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
- at INTLTOOL_DESKTOP_RULE@
-
 EXTRA_DIST =								\
 	AUTHORS								\
 	ChangeLog							\
diff --git a/src/Makefile.am b/src/Makefile.am
index 4ab3254..6a8a31e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -173,7 +173,16 @@ xfce4-notes-plugin.desktop.in: xfce4-notes-plugin.desktop.in.in
 	$(AM_V_GEN) sed -e "s^@EXTERNAL_PLUGIN_PATH@^$(plugindir)^" $< > $@
 
 #
-# Autostart file
+# Applications desktop file
+#
+
+applicationsdir = $(datadir)/applications
+applications_in_files = xfce4-notes.desktop.in
+applications_DATA = $(applications_in_files:.desktop.in=.desktop)
+ at INTLTOOL_DESKTOP_RULE@
+
+#
+# Autostart desktop file
 #
 
 autostartdir = $(sysconfdir)/xdg/autostart
diff --git a/xfce4-notes.desktop.in b/src/xfce4-notes.desktop.in
similarity index 100%
rename from xfce4-notes.desktop.in
rename to src/xfce4-notes.desktop.in