[gnome-applets/wip/segeiger/in-process: 5/6] timer: move panel-applet file to data folder

[Sebastian Geiger <segeiger src gnome org>]

commit 6fc5e4a6c40a518fb392127412d8e437f734760e
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sun Jul 31 18:22:21 2016 +0200

    timer: move panel-applet file to data folder

 configure.ac                                       |    1 +
 po/POTFILES.in                                     |    2 +-
 timer/Makefile.am                                  |   19 +-------------
 timer/data/Makefile.am                             |   26 ++++++++++++++++++++
 ...rg.gnome.applets.TimerApplet.panel-applet.in.in |    0
 5 files changed, 29 insertions(+), 19 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9766c2f..ff69ebc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -734,6 +734,7 @@ AC_CONFIG_FILES([
   stickynotes/pixmaps/Makefile
 
   timer/Makefile
+  timer/data/Makefile
   timer/src/Makefile
 
   tracker-search-bar/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 895c40e..d59a87a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -108,7 +108,7 @@ stickynotes/stickynotes_callbacks.c
 [type: gettext/glade]stickynotes/stickynotes-note.ui
 [type: gettext/glade]stickynotes/stickynotes-preferences.ui
 [type: gettext/glade]stickynotes/stickynotes-properties.ui
-[type: gettext/ini]timer/org.gnome.applets.TimerApplet.panel-applet.in.in
+[type: gettext/ini]timer/data/org.gnome.applets.TimerApplet.panel-applet.in.in
 timer/org.gnome.gnome-applets.timer.gschema.xml.in.in
 timer/src/timerapplet.c
 [type: gettext/ini]tracker-search-bar/data/org.gnome.panel.SearchBar.panel-applet.in.in
diff --git a/timer/Makefile.am b/timer/Makefile.am
index 342ea53..cf07a60 100644
--- a/timer/Makefile.am
+++ b/timer/Makefile.am
@@ -1,20 +1,6 @@
 NULL =
 
-SUBDIRS = src
-
-appletdir       = $(LIBPANEL_APPLET_DIR)
-applet_in_files = org.gnome.applets.TimerApplet.panel-applet.in
-applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
-
-APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libtimer-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
+SUBDIRS = data src
 
 gsettings_schemas_in_in = \
        org.gnome.gnome-applets.timer.gschema.xml.in.in
@@ -31,12 +17,9 @@ gsettings_SCHEMAS = $(gsettings_schemas_in:.xml.in=.xml)
 
 EXTRA_DIST =                                                   \
        $(gsettings_schemas_in_in) \
-       org.gnome.applets.TimerApplet.panel-applet.in.in        \
        $(NULL)
 
 CLEANFILES = \
-       $(applet_DATA) \
-       $(applet_DATA).in \
        $(gsettings_SCHEMAS) \
        *.gschema.valid \
        $(NULL)
diff --git a/timer/data/Makefile.am b/timer/data/Makefile.am
new file mode 100644
index 0000000..171c015
--- /dev/null
+++ b/timer/data/Makefile.am
@@ -0,0 +1,26 @@
+NULL =
+
+appletdir       = $(LIBPANEL_APPLET_DIR)
+applet_in_files = org.gnome.applets.TimerApplet.panel-applet.in
+applet_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
+
+APPLET_LOCATION=$(pkglibdir)/$(LIBPANEL_APPLET_API_VERSION)/libtimer-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.TimerApplet.panel-applet.in.in \
+       $(NULL)
+
+CLEANFILES = \
+       $(applet_DATA) \
+       $(applet_DATA).in \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/timer/org.gnome.applets.TimerApplet.panel-applet.in.in 
b/timer/data/org.gnome.applets.TimerApplet.panel-applet.in.in
similarity index 100%
rename from timer/org.gnome.applets.TimerApplet.panel-applet.in.in
rename to timer/data/org.gnome.applets.TimerApplet.panel-applet.in.in