summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey V. Udaltsov <svu@src.gnome.org>2007-08-20 20:28:47 +0000
committerSergey V. Udaltsov <svu@src.gnome.org>2007-08-20 20:28:47 +0000
commit4dc9a547fa32e0fd1298b0cded570a21bc3cb4bd (patch)
treefb089a42ca2c491f0605e17febb34886a4505d7e
parent5d132dc51b5a3a17c934f62f0de4e558c748370f (diff)
downloadlibgnomekbd-4dc9a547fa32e0fd1298b0cded570a21bc3cb4bd.tar.gz
unneeded libgnome dependency
svn path=/trunk/; revision=154
-rw-r--r--ChangeLog6
-rw-r--r--libgnomekbd.pc.in2
-rw-r--r--libgnomekbdui.pc.in2
-rw-r--r--test/Makefile.am4
4 files changed, 9 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index e835e01..ff068c8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-20 svu
+
+ * test/Makefile.am, libgnomekbdui.pc.in, libgnomekbd.pc.in: unneeded
+ dependency on libgnome, closing
+ http://bugzilla.gnome.org/show_bug.cgi?id=463255
+
2007-08-19 svu
* po/POTFILES.skip: adding desktop.in file,
diff --git a/libgnomekbd.pc.in b/libgnomekbd.pc.in
index 4d10568..d331ba2 100644
--- a/libgnomekbd.pc.in
+++ b/libgnomekbd.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: libgnomekbd
Description: GNOME keyboard shared library
Version: @VERSION@
-Requires: gmodule-export-2.0 gdk-2.0 >= @GDK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@ libgnome-2.0 >= @LIBGNOME_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@ dbus-1 >= @DBUS_REQUIRED@ dbus-glib-1 >= @DBUS_GLIB_REQUIRED@
+Requires: gmodule-export-2.0 gdk-2.0 >= @GDK_REQUIRED@ gconf-2.0 >= @GCONF_REQUIRED@ libxklavier >= @LIBXKLAVIER_REQUIRED@ dbus-1 >= @DBUS_REQUIRED@ dbus-glib-1 >= @DBUS_GLIB_REQUIRED@
Libs: -L${libdir} -lgnomekbd
Cflags: -I${includedir}
diff --git a/libgnomekbdui.pc.in b/libgnomekbdui.pc.in
index bca80cc..c6deaee 100644
--- a/libgnomekbdui.pc.in
+++ b/libgnomekbdui.pc.in
@@ -6,6 +6,6 @@ includedir=@includedir@
Name: libgnomekbd
Description: GNOME keyboard shared library
Version: @VERSION@
-Requires: libgnomekbd = @VERSION@ libgnomeui-2.0 >= @LIBGNOMEUI_REQUIRED@
+Requires: libgnomekbd = @VERSION@
Libs: -L${libdir} -lgnomekbdui
Cflags: -I${includedir}
diff --git a/test/Makefile.am b/test/Makefile.am
index 6645591..d79e0ad 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,7 +16,6 @@ gkbd_indicator_test_CFLAGS= \
$(WARN_CFLAGS) -I$(top_srcdir) -Wall -Werror \
$(GTK_CFLAGS) \
$(LIBGLADE_CFLAGS) \
- $(LIBGNOME_CFLAGS) \
$(LIBXKLAVIER_CFLAGS) \
-I$(top_srcdir)/intl \
-DSYS_PLUGIN_DIR=\"$(libdir)/gnomekbd/\" \
@@ -27,7 +26,6 @@ gkbd_indicator_test_CFLAGS= \
gkbd_indicator_test_LDFLAGS= \
$(GTK_LIBS) \
$(LIBGLADE_LIBS) \
- $(LIBGNOME_LIBS) \
$(LIBXKLAVIER_LIBS) \
$(top_builddir)/libgnomekbd/libgnomekbd.la \
$(top_builddir)/libgnomekbd/libgnomekbdui.la
@@ -38,7 +36,7 @@ gkbd_keyboard_drawing_test_CFLAGS= \
gkbd_keyboard_drawing_test_LDFLAGS= \
$(GTK_LIBS) \
- $(LIBGNOME_LIBS) \
+ -lpopt \
$(LIBXKLAVIER_LIBS) \
$(top_builddir)/libgnomekbd/libgnomekbd.la \
$(top_builddir)/libgnomekbd/libgnomekbdui.la