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

[Sebastian Geiger <segeiger src gnome org>]

commit 26cbe0002b691f13182f06d2c8ac719798cdaa3c
Author: Sebastian Geiger <sbastig gmx net>
Date:   Thu Sep 8 11:12:22 2016 +0200

    drivemount: move files to src folder

 configure.ac                        |    3 +-
 drivemount/Makefile.am              |   31 +-----------------------------
 drivemount/src/Makefile.am          |   36 +++++++++++++++++++++++++++++++++++
 drivemount/{ => src}/drive-button.c |    0
 drivemount/{ => src}/drive-button.h |    0
 drivemount/{ => src}/drive-list.c   |    0
 drivemount/{ => src}/drive-list.h   |    0
 drivemount/{ => src}/drivemount.c   |    0
 po/POTFILES.in                      |    4 +-
 9 files changed, 41 insertions(+), 33 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 299c297..cecf583 100644
--- a/configure.ac
+++ b/configure.ac
@@ -661,8 +661,9 @@ AC_CONFIG_FILES([
   cpufreq/src/cpufreq-selector/Makefile
   cpufreq/src/Makefile
 
-  drivemount/help/Makefile
   drivemount/Makefile
+  drivemount/help/Makefile
+  drivemount/src/Makefile
 
   inhibit/Makefile
   inhibit/icons/Makefile
diff --git a/drivemount/Makefile.am b/drivemount/Makefile.am
index de5bd31..717ef5a 100644
--- a/drivemount/Makefile.am
+++ b/drivemount/Makefile.am
@@ -1,35 +1,6 @@
 NULL =
 
-SUBDIRS = help
-
-drivemount_applet2_CFLAGS = \
-       -I.                                     \
-       -I$(srcdir)                             \
-       -DDRIVEMOUNT_MENU_UI_DIR=\""$(uidir)"\" \
-       -DGNOMELOCALEDIR=\""$(localedir)"\" \
-       $(GNOME_APPLETS_CFLAGS)                 \
-       $(GIO_UNIX_CFLAGS) \
-       $(WARN_CFLAGS) \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-libexec_PROGRAMS = drivemount_applet2
-
-drivemount_applet2_SOURCES =   \
-       drivemount.c            \
-       drive-list.c            \
-       drive-list.h            \
-       drive-button.c          \
-       drive-button.h
-
-drivemount_applet2_LDFLAGS = \
-       $(WARN_LDFLAGS) \
-       $(AM_LDFLAGS) \
-       $(NULL)
-
-drivemount_applet2_LDADD =     \
-       $(GNOME_APPLETS_LIBS)   \
-       $(GIO_UNIX_LIBS)
+SUBDIRS = help src
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.applets.DriveMountApplet.panel-applet.in
diff --git a/drivemount/src/Makefile.am b/drivemount/src/Makefile.am
new file mode 100644
index 0000000..44e6b14
--- /dev/null
+++ b/drivemount/src/Makefile.am
@@ -0,0 +1,36 @@
+NULL =
+
+uidir = $(pkgdatadir)/ui
+
+libexec_PROGRAMS = drivemount_applet2
+
+drivemount_applet2_CFLAGS = \
+       -I. \
+       -I$(srcdir) \
+       -DDRIVEMOUNT_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(GIO_UNIX_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+drivemount_applet2_SOURCES = \
+       drivemount.c \
+       drive-list.c \
+       drive-list.h \
+       drive-button.c \
+       drive-button.h \
+       $(NULL)
+
+drivemount_applet2_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+drivemount_applet2_LDADD = \
+       $(GNOME_APPLETS_LIBS) \
+       $(GIO_UNIX_LIBS) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/drivemount/drive-button.c b/drivemount/src/drive-button.c
similarity index 100%
rename from drivemount/drive-button.c
rename to drivemount/src/drive-button.c
diff --git a/drivemount/drive-button.h b/drivemount/src/drive-button.h
similarity index 100%
rename from drivemount/drive-button.h
rename to drivemount/src/drive-button.h
diff --git a/drivemount/drive-list.c b/drivemount/src/drive-list.c
similarity index 100%
rename from drivemount/drive-list.c
rename to drivemount/src/drive-list.c
diff --git a/drivemount/drive-list.h b/drivemount/src/drive-list.h
similarity index 100%
rename from drivemount/drive-list.h
rename to drivemount/src/drive-list.h
diff --git a/drivemount/drivemount.c b/drivemount/src/drivemount.c
similarity index 100%
rename from drivemount/drivemount.c
rename to drivemount/src/drivemount.c
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3dedc84..d43c6e4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -34,9 +34,9 @@ cpufreq/src/cpufreq-monitor-procfs.c
 cpufreq/src/cpufreq-popup.c
 cpufreq/src/cpufreq-prefs.c
 cpufreq/src/cpufreq-selector/org.gnome.cpufreqselector.policy.in
-drivemount/drive-button.c
+drivemount/src/drive-button.c
+drivemount/src/drivemount.c
 [type: gettext/glade]drivemount/drivemount-applet-menu.xml
-drivemount/drivemount.c
 [type: gettext/ini]drivemount/org.gnome.applets.DriveMountApplet.panel-applet.in.in
 [type: gettext/glade]geyes/geyes-applet-menu.xml
 geyes/src/geyes.c