[gnome-applets/wip/segeiger/in-process: 3/7] trash: move panel-applet file to data folder

[Sebastian Geiger <segeiger src gnome org>]

commit b66ea98ec329aace4fdf429ac53ae5167cc5fef7
Author: Sebastian Geiger <sbastig gmx net>
Date:   Fri Jul 29 23:03:33 2016 +0200

    trash: move panel-applet file to data folder

 configure.ac                                       |    1 +
 trash/Makefile.am                                  |   24 +-----------------
 trash/data/Makefile.am                             |   26 ++++++++++++++++++++
 ...rg.gnome.applets.TrashApplet.panel-applet.in.in |    0
 4 files changed, 28 insertions(+), 23 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index b13f2a6..beabd8e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -740,6 +740,7 @@ AC_CONFIG_FILES([
   trash/help/Makefile
   trash/Makefile
   trash/src/Makefile
+  trash/data/Makefile
 
   windowpicker/Makefile
   windowpicker/data/Makefile
diff --git a/trash/Makefile.am b/trash/Makefile.am
index b8c1d6a..a60002f 100644
--- a/trash/Makefile.am
+++ b/trash/Makefile.am
@@ -1,25 +1,3 @@
-NULL =
-
-SUBDIRS = help src
-
-appletdir       = $(LIBPANEL_APPLET_DIR)
-applet_in_files = org.gnome.applets.TrashApplet.panel-applet.in
-applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
-
-APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libtrash-applet.so
-
-$(applet_in_files): $(applet_in_files).in Makefile
-       $(AM_V_GEN)sed \
-            -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
-            -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
-            $< > $@
-
-%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-
-EXTRA_DIST = \
-       org.gnome.applets.TrashApplet.panel-applet.in.in \
-       $(NULL)
-
-CLEANFILES = $(applet_DATA) $(applet_DATA).in
+SUBDIRS = help src data
 
 -include $(top_srcdir)/git.mk
diff --git a/trash/data/Makefile.am b/trash/data/Makefile.am
new file mode 100644
index 0000000..e2b0068
--- /dev/null
+++ b/trash/data/Makefile.am
@@ -0,0 +1,26 @@
+NULL =
+
+appletdir       = $(LIBPANEL_APPLET_DIR)
+applet_in_files = org.gnome.applets.TrashApplet.panel-applet.in
+applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
+
+APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libtrash-applet.so
+
+$(applet_in_files): $(applet_in_files).in Makefile
+       $(AM_V_GEN)sed \
+            -e "s|\@APPLET_LOCATION\@|$(APPLET_LOCATION)|" \
+            -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \
+            $< > $@
+
+%.panel-applet: %.panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) 
$(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
+EXTRA_DIST = \
+       org.gnome.applets.TrashApplet.panel-applet.in.in \
+       $(NULL)
+
+CLEANFILES = \
+       $(applet_DATA) \
+       $(applet_DATA).in \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/trash/org.gnome.applets.TrashApplet.panel-applet.in.in 
b/trash/data/org.gnome.applets.TrashApplet.panel-applet.in.in
similarity index 100%
rename from trash/org.gnome.applets.TrashApplet.panel-applet.in.in
rename to trash/data/org.gnome.applets.TrashApplet.panel-applet.in.in