Move common helper library into the extension library directory

This makes the build dependencies much saner.

34 files changed, 81 insertions, 87 deletions

diff --git a/capplets/Makefile.am b/capplets/Makefile.am
index 9122834ad..838359a23 100644
--- a/capplets/Makefile.am
+++ b/capplets/Makefile.am
@@ -1,7 +1,6 @@
 NULL =
 
 SUBDIRS = \
-	common			\
 	accessibility		\
 	appearance		\
 	keyboard		\
@@ -10,7 +9,6 @@ SUBDIRS = \
 	$(NULL)
 
 DIST_SUBDIRS = \
-	common			\
 	accessibility		\
 	appearance		\
 	default-applications	\
diff --git a/capplets/accessibility/at-properties/Makefile.am b/capplets/accessibility/at-properties/Makefile.am
index eb8fa7027..2047857d1 100644
--- a/capplets/accessibility/at-properties/Makefile.am
+++ b/capplets/accessibility/at-properties/Makefile.am
@@ -1,6 +1,6 @@
 bin_PROGRAMS = gnome-at-properties
 
-gnome_at_properties_LDADD = $(AT_CAPPLET_LIBS) $(GNOMECC_CAPPLETS_LIBS) $(top_builddir)/capplets/common/libcommon.la
+gnome_at_properties_LDADD = $(AT_CAPPLET_LIBS) $(GNOMECC_CAPPLETS_LIBS) $(top_builddir)/libgnome-control-center-extension/libcommon.la
 gnome_at_properties_SOURCES = \
 	main.c
 gnome_at_properties_LDFLAGS = -export-dynamic
@@ -21,7 +21,7 @@ ui_DATA = at-enable-dialog.ui
 
 INCLUDES   = \
 	$(AT_CAPPLET_CFLAGS)     \
-	-I$(top_srcdir)/capplets/common/ \
+	-I$(top_srcdir)/libgnome-control-center-extension/ \
 	$(GNOMECC_CAPPLETS_CFLAGS) \
 	-DUIDIR=\""$(uidir)"\" \
 	-DPIXMAPDIR=\""$(pixmapdir)"\" \
diff --git a/capplets/appearance/Makefile.am b/capplets/appearance/Makefile.am
index e7fd1329f..514fd7783 100644
--- a/capplets/appearance/Makefile.am
+++ b/capplets/appearance/Makefile.am
@@ -7,7 +7,7 @@ cappletname = appearance
 
 INCLUDES = \
 	$(METACITY_CFLAGS) \
-	-I$(top_srcdir)/capplets/common/ \
+	-I$(top_srcdir)/libgnome-control-center-extension	\
 	$(GNOMECC_CAPPLETS_CFLAGS) \
 	$(FONT_CAPPLET_CFLAGS) \
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
@@ -83,7 +83,7 @@ gnome_appearance_properties_SOURCES = \
 gnome_appearance_properties_LDADD = \
 	libappearance-common.la \
 	$(top_builddir)/libwindow-settings/libgnome-window-settings.la \
-	$(top_builddir)/capplets/common/libcommon.la \
+	$(top_builddir)/libgnome-control-center-extension/libcommon.la \
 	$(GNOMECC_CAPPLETS_LIBS) \
 	$(FONT_CAPPLET_LIBS) \
 	$(METACITY_LIBS)
diff --git a/capplets/common/Makefile.am b/capplets/common/Makefile.am
deleted file mode 100644
index 9bbdbd792..000000000
--- a/capplets/common/Makefile.am
+++ /dev/null
@@ -1,65 +0,0 @@
-EXTRA_DIST =
-
-INCLUDES = \
-	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""				\
-	-DGNOMELOCALEDIR="\"$(datadir)/locale\""			\
-	-DGTK_ENGINE_DIR="\"$(GTK_ENGINE_DIR)\"" 			\
-	-DG_LOG_DOMAIN=\"capplet-common\"				\
-	-DINSTALL_PREFIX=\"$(prefix)\"					\
-	-I$(top_srcdir)							\
-	-I$(top_srcdir)/libwindow-settings				\
-	-DPIXMAP_DIR=\""$(datadir)/gnome-control-center/pixmaps"\"	\
-	$(CAPPLET_CFLAGS)						\
-	$(DBUS_CFLAGS)							\
-	$(GNOME_DESKTOP_CFLAGS)						\
-	$(METACITY_CFLAGS)						\
-	$(GSD_DBUS_CFLAGS)						\
-	$(GIO_CFLAGS)
-
-
-noinst_LTLIBRARIES = libcommon.la
-
-libcommon_la_SOURCES = \
-	activate-settings-daemon.c	\
-	activate-settings-daemon.h	\
-	capplet-stock-icons.c		\
-	capplet-stock-icons.h		\
-	capplet-util.c			\
-	capplet-util.h			\
-	file-transfer-dialog.c		\
-	file-transfer-dialog.h		\
-	gconf-property-editor.c		\
-	gconf-property-editor.h		\
-	gconf-property-editor-marshal.c	\
-	gconf-property-editor-marshal.h \
-	gnome-theme-apply.c		\
-	gnome-theme-apply.h 		\
-	gnome-theme-info.c		\
-	gnome-theme-info.h		\
-	gtkrc-utils.c			\
-	gtkrc-utils.h			\
-	theme-thumbnail.c		\
-	theme-thumbnail.h		\
-	wm-common.c			\
-	wm-common.h
-
-libcommon_la_LIBADD =							\
-	$(top_builddir)/libwindow-settings/libgnome-window-settings.la  \
-	$(METACITY_LIBS)						\
-	$(DBUS_LIBS)							\
-	$(GNOME_DESKTOP_LIBS)						\
-	$(GIO_LIBS)
-
-libcommon_la_LDFLAGS = -export-dynamic -no-undefined -avoid-version
-
-gnome_theme_test_SOURCES = \
-	gnome-theme-test.c
-
-gnome_theme_test_LDADD = 						\
-	libcommon.la							\
-	$(GNOMECC_CAPPLETS_LIBS)
-
-noinst_PROGRAMS = \
-	gnome-theme-test
-
--include $(top_srcdir)/git.mk
diff --git a/capplets/display/Makefile.am b/capplets/display/Makefile.am
index 3f87317ae..5510d2790 100644
--- a/capplets/display/Makefile.am
+++ b/capplets/display/Makefile.am
@@ -15,7 +15,7 @@ gnome_display_properties_SOURCES =	\
 
 gnome_display_properties_LDFLAGS = -export-dynamic
 gnome_display_properties_LDADD = \
-	$(top_builddir)/capplets/common/libcommon.la \
+	$(top_builddir)/libgnome-control-center-extension/libcommon.la \
 	$(DISPLAY_CAPPLET_LIBS)
 
 @INTLTOOL_DESKTOP_RULE@
@@ -37,7 +37,7 @@ desktop_DATA = $(Desktop_in_files:.desktop.in=.desktop)
 
 INCLUDES   = $(DISPLAY_CAPPLET_CFLAGS) \
              $(GNOMECC_CAPPLETS_CFLAGS) \
-	     -I$(top_srcdir)/capplets/common/ \
+	     -I$(top_srcdir)/libgnome-control-center-extension \
 	     -DUIDIR="\"$(uidir)\"" \
 	     -DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
 	     -DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""
diff --git a/capplets/keyboard/Makefile.am b/capplets/keyboard/Makefile.am
index f5336f51a..d66a455b9 100644
--- a/capplets/keyboard/Makefile.am
+++ b/capplets/keyboard/Makefile.am
@@ -6,7 +6,7 @@ cappletname = keyboard
 INCLUDES = \
 	$(GNOMECC_CAPPLETS_CFLAGS) \
 	$(LIBGNOMEKBDUI_CFLAGS) \
-	-I$(top_srcdir)/capplets/common/ \
+	-I$(top_srcdir)/libgnome-control-center-extension	\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\"" \
 	-DGNOMECC_KEYBINDINGS_DIR="\"$(pkgdatadir)/keybindings\"" \
@@ -60,7 +60,7 @@ gnome_keyboard_properties_SOURCES = \
 	gnome-keyboard-properties.c
 
 gnome_keyboard_properties_LDADD = \
-	$(top_builddir)/capplets/common/libcommon.la \
+	$(top_builddir)/libgnome-control-center-extension/libcommon.la \
 	$(GNOMECC_CAPPLETS_LIBS) \
 	$(LIBGNOMEKBDUI_LIBS)
 
diff --git a/capplets/mouse/Makefile.am b/capplets/mouse/Makefile.am
index 8b7d78a7e..21c70c73b 100644
--- a/capplets/mouse/Makefile.am
+++ b/capplets/mouse/Makefile.am
@@ -5,7 +5,7 @@ cappletname = mouse
 
 INCLUDES = 						\
 	$(GNOMECC_CAPPLETS_CFLAGS)			\
-	-I$(top_srcdir)/capplets/common/		\
+	-I$(top_srcdir)/libgnome-control-center-extension	\
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
 	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""		\
 	-DGNOMECC_UI_DIR="\"$(uidir)\""			\
@@ -40,7 +40,11 @@ libmouse_la_CFLAGS =			\
 
 libmouse_la_LIBTOOLFLAGS = --tag=disable-static
 
-gnome_mouse_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS)
+gnome_mouse_properties_LDADD = 		\
+	$(top_builddir)/libgnome-control-center-extension/libcommon.la \
+	$(GNOMECC_CAPPLETS_LIBS)	\
+	$(NULL)
+
 gnome_mouse_properties_SOURCES =	\
 	gnome-mouse-properties.c	\
 	gnome-mouse-accessibility.c	\
diff --git a/capplets/network/Makefile.am b/capplets/network/Makefile.am
index 2b7f8b618..acfdfdeb4 100644
--- a/capplets/network/Makefile.am
+++ b/capplets/network/Makefile.am
@@ -5,7 +5,7 @@ bin_PROGRAMS = gnome-network-properties
 
 gnome_network_properties_SOURCES = gnome-network-properties.c
 gnome_network_properties_LDADD = \
-	$(top_builddir)/capplets/common/libcommon.la \
+	$(top_builddir)/libgnome-control-center-extension/libcommon.la \
 	$(GNOMECC_CAPPLETS_LIBS)
 
 @INTLTOOL_DESKTOP_RULE@
@@ -32,7 +32,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 
 INCLUDES = \
 	$(GNOMECC_CAPPLETS_CFLAGS) \
-	-I$(top_srcdir)/capplets/common/ \
+	-I$(top_srcdir)/libgnome-control-center-extension \
 	-DGNOMELOCALEDIR="\"$(datadir)/locale\"" \
 	-DGNOMECC_UI_DIR="\"$(uidir)\""
 
diff --git a/configure.ac b/configure.ac
index 4334b7f66..0351f5f9b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -343,7 +343,6 @@ capplets/appearance/Makefile
 capplets/appearance/data/Makefile
 capplets/appearance/data/gnome-appearance-properties.desktop.in
 capplets/appearance/data/gnome-theme-installer.desktop.in
-capplets/common/Makefile
 capplets/default-applications/Makefile
 capplets/default-applications/default-applications.desktop.in
 capplets/default-applications/gnome-at-commandline.in
diff --git a/libgnome-control-center-extension/Makefile.am b/libgnome-control-center-extension/Makefile.am
index 67349c623..8b3971120 100644
--- a/libgnome-control-center-extension/Makefile.am
+++ b/libgnome-control-center-extension/Makefile.am
@@ -1,6 +1,19 @@
 NULL =
 
 INCLUDES =						\
+	-DGNOMECC_DATA_DIR="\"$(pkgdatadir)\""				\
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\""			\
+	-DGTK_ENGINE_DIR="\"$(GTK_ENGINE_DIR)\"" 			\
+	-DINSTALL_PREFIX=\"$(prefix)\"					\
+	-I$(top_srcdir)							\
+	-I$(top_srcdir)/libwindow-settings				\
+	-DPIXMAP_DIR=\""$(datadir)/gnome-control-center/pixmaps"\"	\
+	$(CAPPLET_CFLAGS)						\
+	$(DBUS_CFLAGS)							\
+	$(GNOME_DESKTOP_CFLAGS)						\
+	$(METACITY_CFLAGS)						\
+	$(GSD_DBUS_CFLAGS)						\
+	$(GIO_CFLAGS)
 	$(EXTENSION_COMMON_CFLAGS)			\
 	$(NULL)
 
@@ -24,7 +37,7 @@ libgnome_control_center_extension_la_LDFLAGS =		\
         $(NULL)
 
 libgnome_control_center_extension_la_LIBADD = 		\
-	$(top_builddir)/capplets/common/libcommon.la	\
+	libcommon.la					\
 	$(EXTENSION_COMMON_CFLAGS)			\
 	$(NULL)
 
@@ -34,6 +47,51 @@ libgnome_control_center_extension_includedir =		\
 	$(includedir)/gnome-control-center-1/libgnome-control-center-extension	\
 	$(NULL)
 
+noinst_LTLIBRARIES = libcommon.la
+
+libcommon_la_SOURCES = \
+	activate-settings-daemon.c	\
+	activate-settings-daemon.h	\
+	capplet-stock-icons.c		\
+	capplet-stock-icons.h		\
+	capplet-util.c			\
+	capplet-util.h			\
+	file-transfer-dialog.c		\
+	file-transfer-dialog.h		\
+	gconf-property-editor.c		\
+	gconf-property-editor.h		\
+	gconf-property-editor-marshal.c	\
+	gconf-property-editor-marshal.h \
+	gnome-theme-apply.c		\
+	gnome-theme-apply.h 		\
+	gnome-theme-info.c		\
+	gnome-theme-info.h		\
+	gtkrc-utils.c			\
+	gtkrc-utils.h			\
+	theme-thumbnail.c		\
+	theme-thumbnail.h		\
+	wm-common.c			\
+	wm-common.h
+
+libcommon_la_LIBADD =							\
+	$(top_builddir)/libwindow-settings/libgnome-window-settings.la  \
+	$(METACITY_LIBS)						\
+	$(DBUS_LIBS)							\
+	$(GNOME_DESKTOP_LIBS)						\
+	$(GIO_LIBS)
+
+libcommon_la_LDFLAGS = -export-dynamic -no-undefined -avoid-version
+
+gnome_theme_test_SOURCES = \
+	gnome-theme-test.c
+
+gnome_theme_test_LDADD = 						\
+	libcommon.la							\
+	$(GNOMECC_CAPPLETS_LIBS)
+
+noinst_PROGRAMS = \
+	gnome-theme-test
+
 pkgconfigdir=$(libdir)/pkgconfig
 pkgconfig_DATA=libgnome-control-center-extension.pc
 
diff --git a/capplets/common/activate-settings-daemon.c b/libgnome-control-center-extension/activate-settings-daemon.c
index 182921889..182921889 100644
--- a/capplets/common/activate-settings-daemon.c
+++ b/libgnome-control-center-extension/activate-settings-daemon.c
diff --git a/capplets/common/activate-settings-daemon.h b/libgnome-control-center-extension/activate-settings-daemon.h
index fc1558d82..fc1558d82 100644
--- a/capplets/common/activate-settings-daemon.h
+++ b/libgnome-control-center-extension/activate-settings-daemon.h
diff --git a/capplets/common/capplet-stock-icons.c b/libgnome-control-center-extension/capplet-stock-icons.c
index 29b440f57..29b440f57 100644
--- a/capplets/common/capplet-stock-icons.c
+++ b/libgnome-control-center-extension/capplet-stock-icons.c
diff --git a/capplets/common/capplet-stock-icons.h b/libgnome-control-center-extension/capplet-stock-icons.h
index cd39afbdb..cd39afbdb 100644
--- a/capplets/common/capplet-stock-icons.h
+++ b/libgnome-control-center-extension/capplet-stock-icons.h
diff --git a/capplets/common/capplet-util.c b/libgnome-control-center-extension/capplet-util.c
index 16e5776ff..16e5776ff 100644
--- a/capplets/common/capplet-util.c
+++ b/libgnome-control-center-extension/capplet-util.c
diff --git a/capplets/common/capplet-util.h b/libgnome-control-center-extension/capplet-util.h
index 572656535..572656535 100644
--- a/capplets/common/capplet-util.h
+++ b/libgnome-control-center-extension/capplet-util.h
diff --git a/capplets/common/file-transfer-dialog.c b/libgnome-control-center-extension/file-transfer-dialog.c
index 34f415be7..34f415be7 100644
--- a/capplets/common/file-transfer-dialog.c
+++ b/libgnome-control-center-extension/file-transfer-dialog.c
diff --git a/capplets/common/file-transfer-dialog.h b/libgnome-control-center-extension/file-transfer-dialog.h
index d192aaedd..d192aaedd 100644
--- a/capplets/common/file-transfer-dialog.h
+++ b/libgnome-control-center-extension/file-transfer-dialog.h
diff --git a/capplets/common/gconf-property-editor-marshal.c b/libgnome-control-center-extension/gconf-property-editor-marshal.c
index bb6c9b056..bb6c9b056 100644
--- a/capplets/common/gconf-property-editor-marshal.c
+++ b/libgnome-control-center-extension/gconf-property-editor-marshal.c
diff --git a/capplets/common/gconf-property-editor-marshal.h b/libgnome-control-center-extension/gconf-property-editor-marshal.h
index 78306b2ab..78306b2ab 100644
--- a/capplets/common/gconf-property-editor-marshal.h
+++ b/libgnome-control-center-extension/gconf-property-editor-marshal.h
diff --git a/capplets/common/gconf-property-editor.c b/libgnome-control-center-extension/gconf-property-editor.c
index 3f7a0b50a..3f7a0b50a 100644
--- a/capplets/common/gconf-property-editor.c
+++ b/libgnome-control-center-extension/gconf-property-editor.c
diff --git a/capplets/common/gconf-property-editor.h b/libgnome-control-center-extension/gconf-property-editor.h
index cf7257df8..cf7257df8 100644
--- a/capplets/common/gconf-property-editor.h
+++ b/libgnome-control-center-extension/gconf-property-editor.h
diff --git a/capplets/common/gnome-theme-apply.c b/libgnome-control-center-extension/gnome-theme-apply.c
index 73bcc41d3..73bcc41d3 100644
--- a/capplets/common/gnome-theme-apply.c
+++ b/libgnome-control-center-extension/gnome-theme-apply.c
diff --git a/capplets/common/gnome-theme-apply.h b/libgnome-control-center-extension/gnome-theme-apply.h
index e1228dc7b..e1228dc7b 100644
--- a/capplets/common/gnome-theme-apply.h
+++ b/libgnome-control-center-extension/gnome-theme-apply.h
diff --git a/capplets/common/gnome-theme-info.c b/libgnome-control-center-extension/gnome-theme-info.c
index efe4a582b..efe4a582b 100644
--- a/capplets/common/gnome-theme-info.c
+++ b/libgnome-control-center-extension/gnome-theme-info.c
diff --git a/capplets/common/gnome-theme-info.h b/libgnome-control-center-extension/gnome-theme-info.h
index 3502d68cb..3502d68cb 100644
--- a/capplets/common/gnome-theme-info.h
+++ b/libgnome-control-center-extension/gnome-theme-info.h
diff --git a/capplets/common/gnome-theme-test.c b/libgnome-control-center-extension/gnome-theme-test.c
index 5efa6f8e1..5efa6f8e1 100644
--- a/capplets/common/gnome-theme-test.c
+++ b/libgnome-control-center-extension/gnome-theme-test.c
diff --git a/capplets/common/gtkrc-utils.c b/libgnome-control-center-extension/gtkrc-utils.c
index f5429ac62..f5429ac62 100644
--- a/capplets/common/gtkrc-utils.c
+++ b/libgnome-control-center-extension/gtkrc-utils.c
diff --git a/capplets/common/gtkrc-utils.h b/libgnome-control-center-extension/gtkrc-utils.h
index cde004644..cde004644 100644
--- a/capplets/common/gtkrc-utils.h
+++ b/libgnome-control-center-extension/gtkrc-utils.h
diff --git a/capplets/common/theme-thumbnail.c b/libgnome-control-center-extension/theme-thumbnail.c
index 094cb8e3c..094cb8e3c 100644
--- a/capplets/common/theme-thumbnail.c
+++ b/libgnome-control-center-extension/theme-thumbnail.c
diff --git a/capplets/common/theme-thumbnail.h b/libgnome-control-center-extension/theme-thumbnail.h
index 4a433dc32..4a433dc32 100644
--- a/capplets/common/theme-thumbnail.h
+++ b/libgnome-control-center-extension/theme-thumbnail.h
diff --git a/capplets/common/wm-common.c b/libgnome-control-center-extension/wm-common.c
index 6ffc6beec..6ffc6beec 100644
--- a/capplets/common/wm-common.c
+++ b/libgnome-control-center-extension/wm-common.c
diff --git a/capplets/common/wm-common.h b/libgnome-control-center-extension/wm-common.h
index 4da0d2821..4da0d2821 100644
--- a/capplets/common/wm-common.h
+++ b/libgnome-control-center-extension/wm-common.h
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 030349c54..a1162e405 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -32,12 +32,6 @@ capplets/appearance/gnome-wp-item.c
 capplets/appearance/theme-installer.c
 capplets/appearance/theme-save.c
 capplets/appearance/theme-util.c
-capplets/common/activate-settings-daemon.c
-capplets/common/capplet-stock-icons.c
-capplets/common/capplet-util.c
-capplets/common/file-transfer-dialog.c
-capplets/common/gconf-property-editor.c
-capplets/common/gnome-theme-info.c
 capplets/default-applications/default-applications.desktop.in.in
 capplets/default-applications/gnome-at-session.desktop.in.in
 capplets/default-applications/gnome-da-capplet.c
@@ -77,6 +71,12 @@ capplets/network/gnome-network-properties.desktop.in.in
 capplets/windows/gnome-window-properties.c
 [type: gettext/glade]capplets/windows/gnome-window-properties.ui
 capplets/windows/window-properties.desktop.in.in
+libgnome-control-center-extension/activate-settings-daemon.c
+libgnome-control-center-extension/capplet-stock-icons.c
+libgnome-control-center-extension/capplet-util.c
+libgnome-control-center-extension/file-transfer-dialog.c
+libgnome-control-center-extension/gconf-property-editor.c
+libgnome-control-center-extension/gnome-theme-info.c
 libwindow-settings/gnome-wm-manager.c
 libwindow-settings/metacity-window-manager.c
 shell/control-center.c