[gnome-applets/wip/segeiger/in-process: 15/21] modem-lights: move files to src folder

[Sebastian Geiger <segeiger src gnome org>]

commit da4505dbe0840ff1175eac02ac422061d4446239
Author: Sebastian Geiger <sbastig gmx net>
Date:   Wed Sep 7 13:04:39 2016 +0200

    modem-lights: move files to src folder

 configure.ac                          |    1 +
 modem-lights/Makefile.am              |   28 +-------------------------
 modem-lights/src/Makefile.am          |   35 +++++++++++++++++++++++++++++++++
 modem-lights/{ => src}/modem-applet.c |    0
 modem-lights/{ => src}/modem-applet.h |    0
 po/POTFILES.in                        |    2 +-
 6 files changed, 38 insertions(+), 28 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d0f5170..f081f5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -705,6 +705,7 @@ AC_CONFIG_FILES([
   mini-commander/src/Makefile
 
   modem-lights/Makefile
+  modem-lights/src/Makefile
 
   multiload/Makefile
   multiload/help/Makefile
diff --git a/modem-lights/Makefile.am b/modem-lights/Makefile.am
index 78042c3..329c1d8 100644
--- a/modem-lights/Makefile.am
+++ b/modem-lights/Makefile.am
@@ -1,32 +1,6 @@
 NULL =
 
-modem_applet_CFLAGS = \
-       -I. \
-       -I$(srcdir) \
-       -DMODEM_MENU_UI_DIR=\""$(uidir)"\"              \
-       -DGNOMELOCALEDIR=\""$(localedir)"\" \
-       -DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \
-       $(GNOME_APPLETS_CFLAGS)                         \
-       $(XML2_CFLAGS) \
-       $(WARN_CFLAGS) \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-libexec_PROGRAMS = modem_applet
-
-modem_applet_SOURCES = \
-       modem-applet.c \
-       modem-applet.h
-
-modem_applet_LDFLAGS = \
-       $(WARN_LDFLAGS) \
-       $(AM_LDFLAGS) \
-       $(NULL)
-
-modem_applet_LDADD =           \
-       $(GNOME_APPLETS_LIBS)   \
-       $(MODEMLIGHTS_LIBS) \
-       $(XML2_LIBS)
+SUBDIRS = src
 
 uidir  = $(pkgdatadir)/ui
 ui_DATA        = modem-applet-menu.xml
diff --git a/modem-lights/src/Makefile.am b/modem-lights/src/Makefile.am
new file mode 100644
index 0000000..aa31ed0
--- /dev/null
+++ b/modem-lights/src/Makefile.am
@@ -0,0 +1,35 @@
+NULL =
+
+uidir  = $(pkgdatadir)/ui
+
+libexec_PROGRAMS = modem_applet
+
+modem_applet_CFLAGS = \
+       -I. \
+       -I$(srcdir) \
+       -DMODEM_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       -DGTK_BUILDERDIR=\""$(pkgdatadir)/builder"\" \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(XML2_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+modem_applet_SOURCES = \
+       modem-applet.c \
+       modem-applet.h \
+       $(NULL)
+
+modem_applet_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+modem_applet_LDADD = \
+       $(GNOME_APPLETS_LIBS) \
+       $(MODEMLIGHTS_LIBS) \
+       $(XML2_LIBS) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/modem-lights/modem-applet.c b/modem-lights/src/modem-applet.c
similarity index 100%
rename from modem-lights/modem-applet.c
rename to modem-lights/src/modem-applet.c
diff --git a/modem-lights/modem-applet.h b/modem-lights/src/modem-applet.h
similarity index 100%
rename from modem-lights/modem-applet.h
rename to modem-lights/src/modem-applet.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 4d99809..f57167c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -78,7 +78,7 @@ mini-commander/src/mini-commander_applet.c
 [type: gettext/ini]mini-commander/src/org.gnome.applets.MiniCommanderApplet.panel-applet.in.in
 mini-commander/src/org.gnome.gnome-applets.mini-commander.gschema.xml.in.in
 mini-commander/src/preferences.c
-modem-lights/modem-applet.c
+modem-lights/src/modem-applet.c
 [type: gettext/glade]modem-lights/modem-applet-menu.xml
 [type: gettext/glade]modem-lights/modemlights.ui
 [type: gettext/ini]modem-lights/org.gnome.applets.ModemApplet.panel-applet.in.in