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

[Sebastian Geiger <segeiger src gnome org>]

commit cb64bdd0e06cccf686e90cef9cb819766bd6fbe4
Author: Sebastian Geiger <sbastig gmx net>
Date:   Wed Sep 7 13:52:51 2016 +0200

    inhibit: move files to src folder

 configure.ac                                   |    1 +
 inhibit/Makefile.am                            |   43 +--------------------
 inhibit/src/Makefile.am                        |   49 ++++++++++++++++++++++++
 inhibit/{ => src}/inhibit-applet.c             |    0
 inhibit/{ => src}/org.gnome.SessionManager.xml |    0
 po/POTFILES.in                                 |    2 +-
 6 files changed, 53 insertions(+), 42 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index f081f5c..33fd0c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -684,6 +684,7 @@ AC_CONFIG_FILES([
   inhibit/icons/scalable/Makefile
   inhibit/icons/scalable/apps/Makefile
   inhibit/icons/scalable/status/Makefile
+  inhibit/src/Makefile
 
   geyes/help/Makefile
   geyes/Makefile
diff --git a/inhibit/Makefile.am b/inhibit/Makefile.am
index a9d0796..b552911 100644
--- a/inhibit/Makefile.am
+++ b/inhibit/Makefile.am
@@ -1,40 +1,6 @@
 NULL =
 
-SUBDIRS = icons
-
-gnome_inhibit_applet_CFLAGS = \
-       -I.                                     \
-       -I$(srcdir)                             \
-       -DINHIBIT_MENU_UI_DIR=\""$(uidir)"\"    \
-       -DGNOMELOCALEDIR=\""$(localedir)"\" \
-       -DPKG_DATA_DIR=\""$(pkgdatadir)"\" \
-       $(GNOME_APPLETS_CFLAGS) \
-       $(WARN_CFLAGS) \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-libexec_PROGRAMS=gnome-inhibit-applet
-
-gnome_inhibit_applet_SOURCES =                                 \
-       dbus-inhibit.h                                  \
-       dbus-inhibit.c                                  \
-       inhibit-applet.c
-
-gnome_inhibit_applet_LDFLAGS = \
-       $(WARN_LDFLAGS) \
-       $(AM_LDFLAGS) \
-       $(NULL)
-
-gnome_inhibit_applet_LDADD =                                   \
-       $(GNOME_APPLETS_LIBS)
-
-dbus-inhibit.h:
-dbus-inhibit.c: org.gnome.SessionManager.xml
-       $(AM_V_GEN) gdbus-codegen \
-               --interface-prefix=org.gnome. \
-               --generate-c-code dbus-inhibit \
-               --c-namespace DBus \
-               $(srcdir)/org.gnome.SessionManager.xml
+SUBDIRS = icons src
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.InhibitApplet.panel-applet.in
@@ -60,12 +26,7 @@ org.gnome.panel.applet.InhibitAppletFactory.service: $(service_in_files)
 uidir   = $(pkgdatadir)/ui
 ui_DATA = inhibit-applet-menu.xml
 
-BUILT_SOURCES = \
-       dbus-inhibit.c \
-       dbus-inhibit.h \
-       $(NULL)
-
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(BUILT_SOURCES) $(service_DATA)
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
 
 EXTRA_DIST = \
        org.gnome.InhibitApplet.panel-applet.in.in \
diff --git a/inhibit/src/Makefile.am b/inhibit/src/Makefile.am
new file mode 100644
index 0000000..2e1e78c
--- /dev/null
+++ b/inhibit/src/Makefile.am
@@ -0,0 +1,49 @@
+NULL =
+
+uidir = $(pkgdatadir)/ui
+
+libexec_PROGRAMS=gnome-inhibit-applet
+
+gnome_inhibit_applet_CFLAGS = \
+       -I. \
+       -I$(srcdir) \
+       -DINHIBIT_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       -DPKG_DATA_DIR=\""$(pkgdatadir)"\" \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+gnome_inhibit_applet_SOURCES = \
+       $(BUILT_SOURCES) \
+       inhibit-applet.c \
+       $(NULL)
+
+gnome_inhibit_applet_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+gnome_inhibit_applet_LDADD = \
+       $(GNOME_APPLETS_LIBS) \
+       $(NULL)
+
+dbus-inhibit.h:
+dbus-inhibit.c: org.gnome.SessionManager.xml
+       $(AM_V_GEN) gdbus-codegen \
+               --interface-prefix=org.gnome. \
+               --generate-c-code dbus-inhibit \
+               --c-namespace DBus \
+               $(srcdir)/org.gnome.SessionManager.xml
+
+BUILT_SOURCES = \
+       dbus-inhibit.c \
+       dbus-inhibit.h \
+       $(NULL)
+
+CLEANFILES = \
+       $(BUILT_SOURCES) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/inhibit/inhibit-applet.c b/inhibit/src/inhibit-applet.c
similarity index 100%
rename from inhibit/inhibit-applet.c
rename to inhibit/src/inhibit-applet.c
diff --git a/inhibit/org.gnome.SessionManager.xml b/inhibit/src/org.gnome.SessionManager.xml
similarity index 100%
rename from inhibit/org.gnome.SessionManager.xml
rename to inhibit/src/org.gnome.SessionManager.xml
diff --git a/po/POTFILES.in b/po/POTFILES.in
index f57167c..03213cc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -51,7 +51,7 @@ gweather/gweather-pref.c
 gweather/main.c
 [type: gettext/ini]gweather/org.gnome.applets.GWeatherApplet.panel-applet.in.in
 gweather/org.gnome.gnome-applets.gweather.gschema.xml.in.in
-inhibit/inhibit-applet.c
+inhibit/src/inhibit-applet.c
 [type: gettext/glade]inhibit/inhibit-applet-menu.xml
 [type: gettext/ini]inhibit/org.gnome.InhibitApplet.panel-applet.in.in
 [type: gettext/glade]invest-applet/data/financialchart.ui