[gnome-applets/wip/segeiger/in-process: 13/25] charpick: move files to src folder

[Sebastian Geiger <segeiger src gnome org>]

commit b0f3cbc9534a95f1626f5b7eb9d852f127dfc190
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sun Sep 11 13:32:08 2016 +0200

    charpick: move files to src folder

 charpick/Makefile.am            |   28 +---------------------------
 charpick/src/Makefile.am        |   30 ++++++++++++++++++++++++++++++
 charpick/{ => src}/charpick.c   |    0
 charpick/{ => src}/charpick.h   |    0
 charpick/{ => src}/properties.c |    0
 configure.ac                    |    3 ++-
 po/POTFILES.in                  |    4 ++--
 7 files changed, 35 insertions(+), 30 deletions(-)
---
diff --git a/charpick/Makefile.am b/charpick/Makefile.am
index 14bd4ec..4034c00 100644
--- a/charpick/Makefile.am
+++ b/charpick/Makefile.am
@@ -1,32 +1,6 @@
 NULL =
 
-SUBDIRS = help
-
-charpick_applet2_CFLAGS = \
-       -I.                                     \
-       -I$(srcdir)                             \
-       -DCHARPICK_MENU_UI_DIR=\""$(uidir)"\"   \
-       -DGNOMELOCALEDIR=\""$(localedir)"\" \
-       $(GNOME_APPLETS_CFLAGS)         \
-       $(GUCHARMAP_CFLAGS) \
-       $(WARN_CFLAGS) \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-libexec_PROGRAMS = charpick_applet2
-
-charpick_applet2_SOURCES = charpick.c \
-                          charpick.h \
-                          properties.c
-
-charpick_applet2_LDFLAGS = \
-       $(WARN_LDFLAGS) \
-       $(AM_LDFLAGS) \
-       $(NULL)
-
-charpick_applet2_LDADD = \
-                      $(GNOME_APPLETS_LIBS)    \
-                      $(GUCHARMAP_LIBS)
+SUBDIRS = help src
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.CharpickerApplet.panel-applet.in
diff --git a/charpick/src/Makefile.am b/charpick/src/Makefile.am
new file mode 100644
index 0000000..df9ffa6
--- /dev/null
+++ b/charpick/src/Makefile.am
@@ -0,0 +1,30 @@
+NULL =
+
+libexec_PROGRAMS = charpick_applet2
+
+charpick_applet2_CFLAGS = \
+       -I. \
+       -I$(srcdir) \
+       -DCHARPICK_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(GUCHARMAP_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+charpick_applet2_SOURCES = \
+       charpick.c \
+       charpick.h \
+       properties.c \
+       $(NULL)
+
+charpick_applet2_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+charpick_applet2_LDADD = \
+       $(GNOME_APPLETS_LIBS) \
+       $(GUCHARMAP_LIBS) \
+       $(NULL)
diff --git a/charpick/charpick.c b/charpick/src/charpick.c
similarity index 100%
rename from charpick/charpick.c
rename to charpick/src/charpick.c
diff --git a/charpick/charpick.h b/charpick/src/charpick.h
similarity index 100%
rename from charpick/charpick.h
rename to charpick/src/charpick.h
diff --git a/charpick/properties.c b/charpick/src/properties.c
similarity index 100%
rename from charpick/properties.c
rename to charpick/src/properties.c
diff --git a/configure.ac b/configure.ac
index 8d820cb..01aad6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -650,8 +650,9 @@ AC_CONFIG_FILES([
   brightness/icons/scalable/apps/Makefile
   brightness/icons/scalable/status/Makefile
 
-  charpick/help/Makefile
   charpick/Makefile
+  charpick/help/Makefile
+  charpick/src/Makefile
 
   command/Makefile
   command/src/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3be4d0b..9f0225e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -16,10 +16,10 @@ brightness/brightness-applet.c
 [type: gettext/glade]brightness/brightness-applet-menu.xml
 [type: gettext/ini]brightness/org.gnome.BrightnessApplet.panel-applet.in.in
 [type: gettext/glade]charpick/charpick-applet-menu.xml
-charpick/charpick.c
+charpick/src/charpick.c
+charpick/src/properties.c
 [type: gettext/ini]charpick/org.gnome.applets.CharpickerApplet.panel-applet.in.in
 charpick/org.gnome.gnome-applets.charpick.gschema.xml.in.in
-charpick/properties.c
 command/src/command.c
 [type: gettext/ini]command/org.gnome.applets.CommandApplet.panel-applet.in.in
 command/org.gnome.gnome-applets.command.gschema.xml.in.in