[gnome-flashback] common: initial version

[Alberts Muktupāvels <muktupavels src gnome org>]

commit 8820043181c952966e6618ead3daee341af65356
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sat Sep 19 22:52:23 2015 +0300

    common: initial version
    
    Move keybindings from libshell to libcommon as keybindings will be
    used at least also in libinput-sources.

 configure.ac                                       |    7 ++++-
 gnome-flashback/Makefile.am                        |    1 +
 gnome-flashback/libcommon/Makefile.am              |   28 ++++++++++++++++++++
 .../gf-keybindings.c}                              |    2 +-
 .../gf-keybindings.h}                              |    0
 gnome-flashback/libshell/Makefile.am               |    4 +-
 gnome-flashback/libshell/flashback-shell.c         |    2 +-
 7 files changed, 39 insertions(+), 5 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 4b56bea..6455c72 100644
--- a/configure.ac
+++ b/configure.ac
@@ -108,6 +108,11 @@ PKG_CHECK_MODULES([BLUETOOTH_APPLET], [
   gnome-bluetooth-1.0
 ])
 
+PKG_CHECK_MODULES([COMMON], [
+  gtk+-3.0 >= $GTK_REQUIRED
+  x11
+])
+
 PKG_CHECK_MODULES([DESKTOP_BACKGROUND], [
   gtk+-3.0 >= $GTK_REQUIRED
   gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
@@ -166,7 +171,6 @@ PKG_CHECK_MODULES([SHELL], [
   gtk+-3.0 >= $GTK_REQUIRED
   glib-2.0 >= $GLIB_REQUIRED
   gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED
-  x11
 ])
 
 PKG_CHECK_MODULES([GVC], [
@@ -220,6 +224,7 @@ AC_CONFIG_FILES([
   gnome-flashback/Makefile
   gnome-flashback/libautomount-manager/Makefile
   gnome-flashback/libbluetooth-applet/Makefile
+  gnome-flashback/libcommon/Makefile
   gnome-flashback/libdesktop-background/Makefile
   gnome-flashback/libdisplay-config/Makefile
   gnome-flashback/libend-session-dialog/Makefile
diff --git a/gnome-flashback/Makefile.am b/gnome-flashback/Makefile.am
index 0f99d9e..48b6db6 100644
--- a/gnome-flashback/Makefile.am
+++ b/gnome-flashback/Makefile.am
@@ -3,6 +3,7 @@ NULL =
 SUBDIRS = \
        libautomount-manager \
        libbluetooth-applet \
+       libcommon \
        libdesktop-background \
        libdisplay-config \
        libend-session-dialog \
diff --git a/gnome-flashback/libcommon/Makefile.am b/gnome-flashback/libcommon/Makefile.am
new file mode 100644
index 0000000..121f87b
--- /dev/null
+++ b/gnome-flashback/libcommon/Makefile.am
@@ -0,0 +1,28 @@
+NULL =
+
+noinst_LTLIBRARIES = \
+       libcommon.la \
+       $(NULL)
+
+libcommon_la_CFLAGS = \
+       $(COMMON_CFLAGS) \
+       $(WARN_CFLAGS) \
+       $(AM_CFLAGS) \
+       -I$(top_builddir)/gnome-flashback/libcommon \
+       $(NULL)
+
+libcommon_la_SOURCES = \
+  gf-keybindings.c \
+       gf-keybindings.h \
+       $(NULL)
+
+libcommon_la_LDFLAGS = \
+       $(WARN_LDFLAGS) \
+       $(AM_LDFLAGS) \
+       $(NULL)
+
+libcommon_la_LIBADD = \
+       $(COMMON_LIBS) \
+       $(NULL)
+
+-include $(top_srcdir)/git.mk
diff --git a/gnome-flashback/libshell/flashback-key-bindings.c b/gnome-flashback/libcommon/gf-keybindings.c
similarity index 99%
rename from gnome-flashback/libshell/flashback-key-bindings.c
rename to gnome-flashback/libcommon/gf-keybindings.c
index fcc1148..cd44449 100644
--- a/gnome-flashback/libshell/flashback-key-bindings.c
+++ b/gnome-flashback/libcommon/gf-keybindings.c
@@ -23,7 +23,7 @@
 #include <X11/Xlib.h>
 #include <X11/XKBlib.h>
 
-#include "flashback-key-bindings.h"
+#include "gf-keybindings.h"
 
 struct _FlashbackKeyBindingsPrivate {
        GHashTable *table;
diff --git a/gnome-flashback/libshell/flashback-key-bindings.h b/gnome-flashback/libcommon/gf-keybindings.h
similarity index 100%
rename from gnome-flashback/libshell/flashback-key-bindings.h
rename to gnome-flashback/libcommon/gf-keybindings.h
diff --git a/gnome-flashback/libshell/Makefile.am b/gnome-flashback/libshell/Makefile.am
index bbc9cca..4906c81 100644
--- a/gnome-flashback/libshell/Makefile.am
+++ b/gnome-flashback/libshell/Makefile.am
@@ -10,14 +10,13 @@ libshell_la_CFLAGS = \
        $(AM_CFLAGS) \
        -I$(srcdir)/../../gnome-flashback \
        -I$(top_builddir)/gnome-flashback \
+       -I$(top_builddir)/gnome-flashback/libcommon \
        -I$(top_builddir)/gnome-flashback/libshell \
        $(NULL)
 
 libshell_la_SOURCES = \
        flashback-dbus-shell.c \
        flashback-dbus-shell.h \
-       flashback-key-bindings.c \
-       flashback-key-bindings.h \
        flashback-label-window.c \
        flashback-label-window.h \
        flashback-monitor-labeler.c \
@@ -37,6 +36,7 @@ libshell_la_LDFLAGS = \
 
 libshell_la_LIBADD = \
        $(SHELL_LIBS) \
+       $(top_builddir)/gnome-flashback/libcommon/libcommon.la \
        $(NULL)
 
 flashback-dbus-shell.h:
diff --git a/gnome-flashback/libshell/flashback-shell.c b/gnome-flashback/libshell/flashback-shell.c
index 790b8d9..bde0119 100644
--- a/gnome-flashback/libshell/flashback-shell.c
+++ b/gnome-flashback/libshell/flashback-shell.c
@@ -17,9 +17,9 @@
 
 #include <config.h>
 #include <gtk/gtk.h>
+#include <libcommon/gf-keybindings.h>
 #include <libdisplay-config/flashback-display-config.h>
 #include "flashback-dbus-shell.h"
-#include "flashback-key-bindings.h"
 #include "flashback-monitor-labeler.h"
 #include "flashback-osd.h"
 #include "flashback-shell.h"