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

[Sebastian Geiger <segeiger src gnome org>]

commit d50cf80f02e71cd786bb0058b81051d02130b267
Author: Sebastian Geiger <sbastig gmx net>
Date:   Thu Sep 8 10:54:17 2016 +0200

    geyes: move files to src folder

 configure.ac             |    3 ++-
 geyes/Makefile.am        |   30 +-----------------------------
 geyes/src/Makefile.am    |   35 +++++++++++++++++++++++++++++++++++
 geyes/{ => src}/geyes.c  |    0
 geyes/{ => src}/geyes.h  |    0
 geyes/{ => src}/themes.c |    0
 po/POTFILES.in           |    4 ++--
 7 files changed, 40 insertions(+), 32 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9c5cccb..299c297 100644
--- a/configure.ac
+++ b/configure.ac
@@ -686,8 +686,9 @@ AC_CONFIG_FILES([
   inhibit/icons/scalable/status/Makefile
   inhibit/src/Makefile
 
-  geyes/help/Makefile
   geyes/Makefile
+  geyes/help/Makefile
+  geyes/src/Makefile
   geyes/themes/Makefile
 
   gweather/Makefile
diff --git a/geyes/Makefile.am b/geyes/Makefile.am
index 9e9a8f3..df21681 100644
--- a/geyes/Makefile.am
+++ b/geyes/Makefile.am
@@ -1,34 +1,6 @@
 NULL =
 
-SUBDIRS = help themes
-
-geyes_applet2_CFLAGS = \
-       -I.                                             \
-       -I$(srcdir)                                     \
-       $(GNOME_APPLETS_CFLAGS)                         \
-       -I$(includedir)                                 \
-       -DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\"   \
-       -DGEYES_MENU_UI_DIR=\""$(uidir)"\" \
-       -DGNOMELOCALEDIR=\""$(localedir)"\" \
-       $(WARN_CFLAGS) \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-libexec_PROGRAMS = geyes_applet2
-
-geyes_applet2_SOURCES =        \
-        geyes.c \
-       themes.c \
-       geyes.h
-
-geyes_applet2_LDFLAGS = \
-       $(WARN_LDFLAGS) \
-       $(AM_LDFLAGS) \
-       $(NULL)
-
-geyes_applet2_LDADD =          \
-       $(GNOME_APPLETS_LIBS)   \
-       $(LIBM)
+SUBDIRS = help themes src
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.GeyesApplet.panel-applet.in
diff --git a/geyes/src/Makefile.am b/geyes/src/Makefile.am
new file mode 100644
index 0000000..d8c5d12
--- /dev/null
+++ b/geyes/src/Makefile.am
@@ -0,0 +1,35 @@
+NULL =
+
+uidir = $(pkgdatadir)/ui
+
+libexec_PROGRAMS = geyes_applet2
+
+geyes_applet2_CFLAGS = \
+       -I. \
+       -I$(srcdir) \
+       $(GNOME_APPLETS_CFLAGS) \
+       -I$(includedir) \
+       -DGEYES_THEMES_DIR=\""$(pkgdatadir)/geyes/"\" \
+       -DGEYES_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+geyes_applet2_SOURCES = \
+       geyes.c \
+       themes.c \
+       geyes.h \
+       $(NULL)
+
+geyes_applet2_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+geyes_applet2_LDADD = \
+       $(GNOME_APPLETS_LIBS) \
+       $(LIBM) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/geyes/geyes.c b/geyes/src/geyes.c
similarity index 100%
rename from geyes/geyes.c
rename to geyes/src/geyes.c
diff --git a/geyes/geyes.h b/geyes/src/geyes.h
similarity index 100%
rename from geyes/geyes.h
rename to geyes/src/geyes.h
diff --git a/geyes/themes.c b/geyes/src/themes.c
similarity index 100%
rename from geyes/themes.c
rename to geyes/src/themes.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 6f4653c..3dedc84 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -39,10 +39,10 @@ drivemount/drive-button.c
 drivemount/drivemount.c
 [type: gettext/ini]drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in
 [type: gettext/glade]geyes/geyes-applet-menu.xml
-geyes/geyes.c
+geyes/src/geyes.c
+geyes/src/themes.c
 [type: gettext/ini]geyes/org.gnome.applets.GeyesApplet.panel-applet.in.in
 geyes/org.gnome.gnome-applets.geyes.gschema.xml.in.in
-geyes/themes.c
 gweather/src/gweather-about.c
 gweather/src/gweather-applet.c
 gweather/src/gweather-dialog.c