Bug 534319 - GLib's .pc files could use Libs.private

2008-05-25  Tor Lillqvist  <tml@novell.com>

	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

diff --git a/ChangeLog b/ChangeLog
index d8fac2638e0696d6f3f1dbc4a5c18d61c01cd91f..af1c78cc14fa748b116f3ccd0e516cede1cb0620 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2008-05-25  Tor Lillqvist  <tml@novell.com>
+
+       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  <mclasen@redhat.com>
 
        * 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 0290ea78c6bbdfefd40b5196f5cdc352c186a5bf..0c0e95f0190a07d107107b52e09858d192d9bbaa 100644 (file)
--- 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 c31419c164d70c6feeebecde100b97770b99c7c9..3d1ac12e369a6b930c77c2785d0ff65af622f21b 100644 (file)
--- 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 680cb6c24b0e0cf9e664fdf9e74b2b5573e8bb48..9a0d8aacda07d3a15e11e90983214d08366d2034 100644 (file)
--- 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 e723007a97a08d5aa69ab8dce05a291da60859a0..7117b31e0d3eb91efd82771129e5f52d92c2c208 100644 (file)
--- 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 e723007a97a08d5aa69ab8dce05a291da60859a0..4bf55973d92a1c22cccc2f769973f087e124872c 100644 (file)
--- 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 eff829487e66b1153a66f1a28497c66c37875e2e..6c4c2318f892e0ff16e5ce1b2b7635fb5ec0f95b 100644 (file)
--- 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: