From 6938ac7b0960fb7d40e75a4966d75f296472177b Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Sun, 25 May 2008 10:26:42 +0000 Subject: [PATCH] Bug 534319 - GLib's .pc files could use Libs.private 2008-05-25 Tor Lillqvist Bug 534319 - GLib's .pc files could use Libs.private * glib-2.0-uninstalled.pc.in * glib-2.0.pc.in * gmodule-2.0-uninstalled.pc.in * gmodule-2.0.pc.in * gmodule-export-2.0.pc.in * gmodule-no-export-2.0.pc.in: Move ICONV_LIBS and G_MODULE_LIBS to Libs.private. svn path=/trunk/; revision=6925 --- ChangeLog | 11 +++++++++++ glib-2.0-uninstalled.pc.in | 2 +- glib-2.0.pc.in | 3 ++- gmodule-2.0-uninstalled.pc.in | 2 +- gmodule-2.0.pc.in | 3 ++- gmodule-export-2.0.pc.in | 3 ++- gmodule-no-export-2.0.pc.in | 3 ++- 7 files changed, 21 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index d8fac2638..af1c78cc1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2008-05-25 Tor Lillqvist + + Bug 534319 - GLib's .pc files could use Libs.private + + * glib-2.0-uninstalled.pc.in + * glib-2.0.pc.in + * gmodule-2.0-uninstalled.pc.in + * gmodule-2.0.pc.in + * gmodule-export-2.0.pc.in + * gmodule-no-export-2.0.pc.in: Move ICONV_LIBS and G_MODULE_LIBS to Libs.private. + 2008-05-24 Matthias Clasen * glib/gfileutils.c (g_file_open_tmp): Small documention addition. diff --git a/glib-2.0-uninstalled.pc.in b/glib-2.0-uninstalled.pc.in index 0290ea78c..0c0e95f01 100644 --- a/glib-2.0-uninstalled.pc.in +++ b/glib-2.0-uninstalled.pc.in @@ -5,5 +5,5 @@ glib_mkenums=${pc_top_builddir}/${pcfiledir}/@srcdir@/gobject/glib-mkenums Name: GLib Uninstalled Description: C Utility Library, Not Installed Version: @VERSION@ -Libs: ${pc_top_builddir}/${pcfiledir}/glib/libglib-2.0.la @ICONV_LIBS@ @INTLLIBS@ +Libs: ${pc_top_builddir}/${pcfiledir}/glib/libglib-2.0.la Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir}/@srcdir@/glib diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in index c31419c16..3d1ac12e3 100644 --- a/glib-2.0.pc.in +++ b/glib-2.0.pc.in @@ -10,5 +10,6 @@ glib_mkenums=glib-mkenums Name: GLib Description: C Utility Library Version: @VERSION@ -Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ @ICONV_LIBS@ +Libs: -L${libdir} -lglib-2.0 @INTLLIBS@ +Libs.private: @ICONV_LIBS@ Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include @GLIB_EXTRA_CFLAGS@ diff --git a/gmodule-2.0-uninstalled.pc.in b/gmodule-2.0-uninstalled.pc.in index 680cb6c24..9a0d8aacd 100644 --- a/gmodule-2.0-uninstalled.pc.in +++ b/gmodule-2.0-uninstalled.pc.in @@ -4,5 +4,5 @@ Name: GModule Uninstalled Description: Dynamic module loader for GLib, Not Installed Requires: glib-2.0-uninstalled Version: @VERSION@ -Libs: @G_MODULE_LDFLAGS@ ${pc_top_builddir}/${pcfiledir}/gmodule/libgmodule-2.0.la @G_MODULE_LIBS@ +Libs: @G_MODULE_LDFLAGS@ ${pc_top_builddir}/${pcfiledir}/gmodule/libgmodule-2.0.la Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/gmodule diff --git a/gmodule-2.0.pc.in b/gmodule-2.0.pc.in index e723007a9..7117b31e0 100644 --- a/gmodule-2.0.pc.in +++ b/gmodule-2.0.pc.in @@ -9,5 +9,6 @@ Name: GModule Description: Dynamic module loader for GLib Requires: glib-2.0 Version: @VERSION@ -Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_MODULE_LIBS@ +Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 +Libs.private: @G_MODULE_LIBS@ Cflags: diff --git a/gmodule-export-2.0.pc.in b/gmodule-export-2.0.pc.in index e723007a9..4bf55973d 100644 --- a/gmodule-export-2.0.pc.in +++ b/gmodule-export-2.0.pc.in @@ -9,5 +9,6 @@ Name: GModule Description: Dynamic module loader for GLib Requires: glib-2.0 Version: @VERSION@ -Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 @G_MODULE_LIBS@ +Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-2.0 +Libs.private: @G_MODULE_LIBS@ Cflags: diff --git a/gmodule-no-export-2.0.pc.in b/gmodule-no-export-2.0.pc.in index eff829487..6c4c2318f 100644 --- a/gmodule-no-export-2.0.pc.in +++ b/gmodule-no-export-2.0.pc.in @@ -9,5 +9,6 @@ Name: GModule Description: Dynamic module loader for GLib Requires: glib-2.0 Version: @VERSION@ -Libs: -L${libdir} -lgmodule-2.0 @G_MODULE_LIBS@ +Libs: -L${libdir} -lgmodule-2.0 +Libs.private: @G_MODULE_LIBS@ Cflags: