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

[Sebastian Geiger <segeiger src gnome org>]

commit 32b43d0c541dbea48cd8725168945160c08daf21
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sun Sep 11 16:59:36 2016 +0200

    battstat: move files to src folder

 battstat/Makefile.am                  |   61 +-----------------------------
 battstat/src/Makefile.am              |   66 +++++++++++++++++++++++++++++++++
 battstat/{ => src}/acpi-freebsd.c     |    0
 battstat/{ => src}/acpi-freebsd.h     |    0
 battstat/{ => src}/acpi-linux.c       |    0
 battstat/{ => src}/acpi-linux.h       |    0
 battstat/{ => src}/apmlib/Makefile.am |    8 ++++
 battstat/{ => src}/apmlib/apm.h       |    0
 battstat/{ => src}/apmlib/apmlib.c    |    0
 battstat/{ => src}/battstat-upower.c  |    0
 battstat/{ => src}/battstat-upower.h  |    0
 battstat/{ => src}/battstat.h         |    0
 battstat/{ => src}/battstat_applet.c  |    0
 battstat/{ => src}/pixmaps.h          |    0
 battstat/{ => src}/power-management.c |    0
 battstat/{ => src}/properties.c       |    0
 configure.ac                          |    5 +-
 po/POTFILES.in                        |    4 +-
 18 files changed, 81 insertions(+), 63 deletions(-)
---
diff --git a/battstat/Makefile.am b/battstat/Makefile.am
index 8460d71..03b2ddf 100644
--- a/battstat/Makefile.am
+++ b/battstat/Makefile.am
@@ -5,66 +5,9 @@ builder_DATA = battstat_applet.ui
 
 ACPIINC= @ACPIINC@
 
-if NEED_LIBAPM
-if HAVE_LIBAPM
-APMLIB = -lapm
-APMDIR =
-APMINC = 
-else
-APMLIB = apmlib/libapm.la
-APMDIR = apmlib
-APMINC = -I$(srcdir)/apmlib/
-endif
-else
-APMLIB =
-APMDIR =
-APMINC = 
-endif
-
-SUBDIRS = help sounds $(APMDIR)
-
-DIST_SUBDIRS = help sounds apmlib
-
-libexec_PROGRAMS = battstat-applet-2
-
-battstat_applet_2_CFLAGS = \
-       $(GNOME_APPLETS_CFLAGS)                 \
-       $(LIBNOTIFY_CFLAGS)                     \
-       $(UPOWER_CFLAGS)                        \
-       $(APMINC)                               \
-       $(ACPIINC)                              \
-       -DG_LOG_DOMAIN=\"battstat_applet\"      \
-       -DBATTSTAT_MENU_UI_DIR=\""$(uidir)"\" \
-       -DGNOMELOCALEDIR=\""$(localedir)"\" \
-       -DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \
-       $(WARN_CFLAGS) \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-battstat_applet_2_SOURCES = \
-       battstat.h \
-       pixmaps.h \
-       properties.c \
-       battstat_applet.c \
-       power-management.c \
-       acpi-linux.c \
-       acpi-linux.h \
-       acpi-freebsd.c \
-       acpi-freebsd.h \
-       battstat-upower.c \
-       battstat-upower.h
-
-battstat_applet_2_LDFLAGS = \
-       $(WARN_LDFLAGS) \
-       $(AM_LDFLAGS) \
-       $(NULL)
-
-battstat_applet_2_LDADD = \
-                    $(GNOME_APPLETS_LIBS) \
-                    $(LIBNOTIFY_LIBS) \
-                    $(UPOWER_LIBS) \
-                    $(LIBM) \
-                    $(APMLIB)
+SUBDIRS = help sounds src
+
+DIST_SUBDIRS = help sounds
 
 gsettings_schemas_in_in = \
        org.gnome.gnome-applets.battstat.gschema.xml.in.in
diff --git a/battstat/src/Makefile.am b/battstat/src/Makefile.am
new file mode 100644
index 0000000..e50364b
--- /dev/null
+++ b/battstat/src/Makefile.am
@@ -0,0 +1,66 @@
+NULL =
+
+SUBDIRS = apmlib
+
+uidir = $(pkgdatadir)/ui
+
+if NEED_LIBAPM
+if HAVE_LIBAPM
+APMLIB = -lapm
+APMDIR =
+APMINC =
+else
+APMLIB = apmlib/libapm.la
+APMDIR = apmlib
+APMINC = -I$(srcdir)/apmlib/
+endif
+else
+APMLIB =
+APMDIR =
+APMINC =
+endif
+
+libexec_PROGRAMS = battstat-applet-2
+
+battstat_applet_2_CFLAGS = \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(LIBNOTIFY_CFLAGS) \
+       $(UPOWER_CFLAGS) \
+       $(APMINC) \
+       $(ACPIINC) \
+       -DG_LOG_DOMAIN=\"battstat_applet\" \
+       -DBATTSTAT_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       -DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+battstat_applet_2_SOURCES = \
+       battstat.h \
+       pixmaps.h \
+       properties.c \
+       battstat_applet.c \
+       power-management.c \
+       acpi-linux.c \
+       acpi-linux.h \
+       acpi-freebsd.c \
+       acpi-freebsd.h \
+       battstat-upower.c \
+       battstat-upower.h \
+       $(NULL)
+
+battstat_applet_2_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+battstat_applet_2_LDADD = \
+       $(GNOME_APPLETS_LIBS) \
+       $(LIBNOTIFY_LIBS) \
+       $(UPOWER_LIBS) \
+       $(LIBM) \
+       $(APMLIB) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/battstat/acpi-freebsd.c b/battstat/src/acpi-freebsd.c
similarity index 100%
rename from battstat/acpi-freebsd.c
rename to battstat/src/acpi-freebsd.c
diff --git a/battstat/acpi-freebsd.h b/battstat/src/acpi-freebsd.h
similarity index 100%
rename from battstat/acpi-freebsd.h
rename to battstat/src/acpi-freebsd.h
diff --git a/battstat/acpi-linux.c b/battstat/src/acpi-linux.c
similarity index 100%
rename from battstat/acpi-linux.c
rename to battstat/src/acpi-linux.c
diff --git a/battstat/acpi-linux.h b/battstat/src/acpi-linux.h
similarity index 100%
rename from battstat/acpi-linux.h
rename to battstat/src/acpi-linux.h
diff --git a/battstat/apmlib/Makefile.am b/battstat/src/apmlib/Makefile.am
similarity index 91%
rename from battstat/apmlib/Makefile.am
rename to battstat/src/apmlib/Makefile.am
index cf21386..964d8bf 100644
--- a/battstat/apmlib/Makefile.am
+++ b/battstat/src/apmlib/Makefile.am
@@ -6,6 +6,10 @@
 
 NULL =
 
+if NEED_LIBAPM
+
+if !HAVE_LIBAPM
+
 noinst_LTLIBRARIES = libapm.la
 
 libapm_la_SOURCES = \
@@ -27,4 +31,8 @@ libapm_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        $(NULL)
 
+endif
+
+endif
+
 -include $(top_srcdir)/git.mk
diff --git a/battstat/apmlib/apm.h b/battstat/src/apmlib/apm.h
similarity index 100%
rename from battstat/apmlib/apm.h
rename to battstat/src/apmlib/apm.h
diff --git a/battstat/apmlib/apmlib.c b/battstat/src/apmlib/apmlib.c
similarity index 100%
rename from battstat/apmlib/apmlib.c
rename to battstat/src/apmlib/apmlib.c
diff --git a/battstat/battstat-upower.c b/battstat/src/battstat-upower.c
similarity index 100%
rename from battstat/battstat-upower.c
rename to battstat/src/battstat-upower.c
diff --git a/battstat/battstat-upower.h b/battstat/src/battstat-upower.h
similarity index 100%
rename from battstat/battstat-upower.h
rename to battstat/src/battstat-upower.h
diff --git a/battstat/battstat.h b/battstat/src/battstat.h
similarity index 100%
rename from battstat/battstat.h
rename to battstat/src/battstat.h
diff --git a/battstat/battstat_applet.c b/battstat/src/battstat_applet.c
similarity index 100%
rename from battstat/battstat_applet.c
rename to battstat/src/battstat_applet.c
diff --git a/battstat/pixmaps.h b/battstat/src/pixmaps.h
similarity index 100%
rename from battstat/pixmaps.h
rename to battstat/src/pixmaps.h
diff --git a/battstat/power-management.c b/battstat/src/power-management.c
similarity index 100%
rename from battstat/power-management.c
rename to battstat/src/power-management.c
diff --git a/battstat/properties.c b/battstat/src/properties.c
similarity index 100%
rename from battstat/properties.c
rename to battstat/src/properties.c
diff --git a/configure.ac b/configure.ac
index 139bd04..97acf51 100644
--- a/configure.ac
+++ b/configure.ac
@@ -625,10 +625,11 @@ AC_CONFIG_FILES([
   accessx-status/pixmaps/Makefile
   accessx-status/src/Makefile
 
-  battstat/apmlib/Makefile
-  battstat/help/Makefile
   battstat/Makefile
+  battstat/help/Makefile
   battstat/sounds/Makefile
+  battstat/src/Makefile
+  battstat/src/apmlib/Makefile
 
   brightness/Makefile
   brightness/icons/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 722de87..8ac7554 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -5,12 +5,12 @@
 [type: gettext/glade]accessx-status/accessx-status-applet-menu.xml
 accessx-status/src/applet.c
 [type: gettext/ini]accessx-status/org.gnome.applets.AccessxStatusApplet.panel-applet.in.in
-battstat/battstat_applet.c
+battstat/src/battstat_applet.c
+battstat/src/properties.c
 [type: gettext/glade]battstat/battstat-applet-menu.xml
 [type: gettext/glade]battstat/battstat_applet.ui
 [type: gettext/ini]battstat/org.gnome.applets.BattstatApplet.panel-applet.in.in
 battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in
-battstat/properties.c
 battstat/sounds/battstat_applet.soundlist.in
 brightness/src/brightness-applet.c
 [type: gettext/glade]brightness/brightness-applet-menu.xml