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

[Sebastian Geiger <segeiger src gnome org>]

commit 63f1f888a4fc649261593209b76f57397f3b89b3
Author: Sebastian Geiger <sbastig gmx net>
Date:   Sun Sep 11 13:48:33 2016 +0200

    brightness: move files to src folder

 brightness/Makefile.am                             |   43 +----------------
 brightness/src/Makefile.am                         |   49 ++++++++++++++++++++
 brightness/{ => src}/brightness-applet.c           |    0
 .../org.gnome.SettingsDaemon.Power.Screen.xml      |    0
 configure.ac                                       |    1 +
 po/POTFILES.in                                     |    2 +-
 6 files changed, 53 insertions(+), 42 deletions(-)
---
diff --git a/brightness/Makefile.am b/brightness/Makefile.am
index 0a1fff5..0dcc0f3 100644
--- a/brightness/Makefile.am
+++ b/brightness/Makefile.am
@@ -1,40 +1,6 @@
 NULL =
 
-SUBDIRS = icons
-
-libexec_PROGRAMS=gnome-brightness-applet
-
-gnome_brightness_applet_CFLAGS = \
-       -I.                                     \
-       -I$(srcdir)                             \
-       -DBRIGHTNESS_MENU_UI_DIR=\""$(uidir)"\" \
-       -DGNOMELOCALEDIR=\""$(localedir)"\" \
-       -DPKG_DATA_DIR=\""$(pkgdatadir)"\" \
-       $(GNOME_APPLETS_CFLAGS)                 \
-       $(WARN_CFLAGS) \
-       $(AM_CFLAGS) \
-       $(NULL)
-
-gnome_brightness_applet_SOURCES =                              \
-       dbus-brightness.h                                       \
-       dbus-brightness.c                                       \
-       brightness-applet.c
-
-gnome_brightness_applet_LDFLAGS = \
-       $(WARN_LDFLAGS) \
-       $(AM_LDFLAGS) \
-       $(NULL)
-
-gnome_brightness_applet_LDADD =                                        \
-       $(GNOME_APPLETS_LIBS)
-
-dbus-brightness.h:
-dbus-brightness.c: org.gnome.SettingsDaemon.Power.Screen.xml
-       $(AM_V_GEN) gdbus-codegen \
-               --interface-prefix=org.gnome. \
-               --generate-c-code dbus-brightness \
-               --c-namespace DBus \
-               $(srcdir)/org.gnome.SettingsDaemon.Power.Screen.xml
+SUBDIRS = icons src
 
 appletdir       = $(LIBPANEL_APPLET_DIR)
 applet_in_files = org.gnome.BrightnessApplet.panel-applet.in
@@ -60,12 +26,7 @@ org.gnome.panel.applet.BrightnessAppletFactory.service: $(service_in_files)
 uidir   = $(pkgdatadir)/ui
 ui_DATA = brightness-applet-menu.xml
 
-BUILT_SOURCES = \
-       dbus-brightness.c \
-       dbus-brightness.h \
-       $(NULL)
-
-CLEANFILES = $(applet_DATA) $(applet_DATA).in $(BUILT_SOURCES) $(service_DATA)
+CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA)
 
 EXTRA_DIST = \
        org.gnome.BrightnessApplet.panel-applet.in.in \
diff --git a/brightness/src/Makefile.am b/brightness/src/Makefile.am
new file mode 100644
index 0000000..03d3bed
--- /dev/null
+++ b/brightness/src/Makefile.am
@@ -0,0 +1,49 @@
+NULL =
+
+uidir   = $(pkgdatadir)/ui
+
+libexec_PROGRAMS=gnome-brightness-applet
+
+gnome_brightness_applet_CFLAGS = \
+       -I. \
+       -I$(srcdir) \
+       -DBRIGHTNESS_MENU_UI_DIR=\""$(uidir)"\" \
+       -DGNOMELOCALEDIR=\""$(localedir)"\" \
+       -DPKG_DATA_DIR=\""$(pkgdatadir)"\" \
+       $(GNOME_APPLETS_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       $(NULL)
+
+gnome_brightness_applet_SOURCES = \
+       $(BUILT_SOURCES) \
+       brightness-applet.c \
+       $(NULL)
+
+gnome_brightness_applet_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+gnome_brightness_applet_LDADD = \
+       $(GNOME_APPLETS_LIBS) \
+       $(NULL)
+
+BUILT_SOURCES = \
+       dbus-brightness.c \
+       dbus-brightness.h \
+       $(NULL)
+
+dbus-brightness.h:
+dbus-brightness.c: org.gnome.SettingsDaemon.Power.Screen.xml
+       $(AM_V_GEN) gdbus-codegen \
+               --interface-prefix=org.gnome. \
+               --generate-c-code dbus-brightness \
+               --c-namespace DBus \
+               $(srcdir)/org.gnome.SettingsDaemon.Power.Screen.xml
+
+CLEANFILES = \
+       $(BUILT_SOURCES) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/brightness/brightness-applet.c b/brightness/src/brightness-applet.c
similarity index 100%
rename from brightness/brightness-applet.c
rename to brightness/src/brightness-applet.c
diff --git a/brightness/org.gnome.SettingsDaemon.Power.Screen.xml 
b/brightness/src/org.gnome.SettingsDaemon.Power.Screen.xml
similarity index 100%
rename from brightness/org.gnome.SettingsDaemon.Power.Screen.xml
rename to brightness/src/org.gnome.SettingsDaemon.Power.Screen.xml
diff --git a/configure.ac b/configure.ac
index 01aad6c..1050a7e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -649,6 +649,7 @@ AC_CONFIG_FILES([
   brightness/icons/scalable/Makefile
   brightness/icons/scalable/apps/Makefile
   brightness/icons/scalable/status/Makefile
+  brightness/src/Makefile
 
   charpick/Makefile
   charpick/help/Makefile
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 9f0225e..54a7334 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,7 +12,7 @@ battstat/battstat_applet.c
 battstat/org.gnome.gnome-applets.battstat.gschema.xml.in.in
 battstat/properties.c
 battstat/sounds/battstat_applet.soundlist.in
-brightness/brightness-applet.c
+brightness/src/brightness-applet.c
 [type: gettext/glade]brightness/brightness-applet-menu.xml
 [type: gettext/ini]brightness/org.gnome.BrightnessApplet.panel-applet.in.in
 [type: gettext/glade]charpick/charpick-applet-menu.xml