[gnome-control-center] common: Move eggaccelerators to common/

[Bastien Nocera <hadess src gnome org>]

commit 3574d8f8829721ce5bb58eeab021fd14da1108b8
Author: Bastien Nocera <hadess hadess net>
Date:   Wed Feb 23 15:40:46 2011 +0000

    common: Move eggaccelerators to common/
    
    So we can share it with the universal-access panel.

 panels/common/Makefile.am                     |   11 ++++++++++-
 panels/{keyboard => common}/eggaccelerators.c |    0
 panels/{keyboard => common}/eggaccelerators.h |    0
 panels/keyboard/Makefile.am                   |    8 +++-----
 4 files changed, 13 insertions(+), 6 deletions(-)
---
diff --git a/panels/common/Makefile.am b/panels/common/Makefile.am
index 575a695..e9fda23 100644
--- a/panels/common/Makefile.am
+++ b/panels/common/Makefile.am
@@ -1,7 +1,7 @@
 # This is used in PANEL_CFLAGS
 cappletname = common
 
-noinst_LTLIBRARIES = liblanguage.la
+noinst_LTLIBRARIES = liblanguage.la libshortcuts.la
 
 AM_CPPFLAGS =						\
 	$(PANEL_CFLAGS)					\
@@ -25,4 +25,13 @@ liblanguage_la_LIBADD = 		\
 
 liblanguage_la_LDFLAGS = $(PANEL_LDFLAGS)
 
+libshortcuts_la_SOURCES =		\
+	eggaccelerators.h		\
+	eggaccelerators.c
+
+libshortcuts_la_LIBADD =		\
+	$(PANEL_LIBS)
+
+libshortcuts_la_LDFLAGS = $(PANEL_LDFLAGS)
+
 -include $(top_srcdir)/git.mk
diff --git a/panels/keyboard/eggaccelerators.c b/panels/common/eggaccelerators.c
similarity index 100%
rename from panels/keyboard/eggaccelerators.c
rename to panels/common/eggaccelerators.c
diff --git a/panels/keyboard/eggaccelerators.h b/panels/common/eggaccelerators.h
similarity index 100%
rename from panels/keyboard/eggaccelerators.h
rename to panels/common/eggaccelerators.h
diff --git a/panels/keyboard/Makefile.am b/panels/keyboard/Makefile.am
index 97d5660..1d561ef 100644
--- a/panels/keyboard/Makefile.am
+++ b/panels/keyboard/Makefile.am
@@ -17,12 +17,10 @@ libkeyboard_la_SOURCES =   \
 	keyboard-shortcuts.c		\
 	keyboard-shortcuts.h		\
 	eggcellrendererkeys.c		\
-	eggcellrendererkeys.h		\
-	eggaccelerators.c		\
-	eggaccelerators.h
+	eggcellrendererkeys.h
 
-libkeyboard_la_CFLAGS = $(PANEL_CFLAGS) $(KEYBOARD_PANEL_CFLAGS)
-libkeyboard_la_LIBADD = $(PANEL_LIBS) $(KEYBOARD_PANEL_LIBS)
+libkeyboard_la_CFLAGS = $(PANEL_CFLAGS) $(KEYBOARD_PANEL_CFLAGS) -I$(top_srcdir)/panels/common/
+libkeyboard_la_LIBADD = $(PANEL_LIBS) $(KEYBOARD_PANEL_LIBS) $(top_builddir)/panels/common/libshortcuts.la
 libkeyboard_la_LDFLAGS = $(PANEL_LDFLAGS)
 
 @INTLTOOL_DESKTOP_RULE@