From 306aa62ea5fa4d3a57bca419afcc159f9509b476 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Sun, 16 Oct 2011 19:14:18 -0400 Subject: [PATCH] drop -uninstalled.pc files These were meant to provide the ability to use GLib directly out of its build tree but have a couple of rather serious limitations that prevent their serious use: - these files only worked with programs built using libtool - for non-trivial uses, other environment variables will need to be setup to allow GLib to function properly - the system doesn't stack well when attempting to use multiple libraries all uninstalled The jhbuild --prefix= style system works much better in every way, so we remove this old hack. --- Makefile.am | 9 +-------- README.in | 2 ++ configure.ac | 7 ------- gio-2.0-uninstalled.pc.in | 6 ------ gio-unix-2.0-uninstalled.pc.in | 6 ------ glib-2.0-uninstalled.pc.in | 9 --------- gmodule-2.0-uninstalled.pc.in | 8 -------- gmodule-no-export-2.0-uninstalled.pc.in | 14 -------------- gobject-2.0-uninstalled.pc.in | 7 ------- gthread-2.0-uninstalled.pc.in | 6 ------ 10 files changed, 3 insertions(+), 71 deletions(-) delete mode 100644 gio-2.0-uninstalled.pc.in delete mode 100644 gio-unix-2.0-uninstalled.pc.in delete mode 100644 glib-2.0-uninstalled.pc.in delete mode 100644 gmodule-2.0-uninstalled.pc.in delete mode 100644 gmodule-no-export-2.0-uninstalled.pc.in delete mode 100644 gobject-2.0-uninstalled.pc.in delete mode 100644 gthread-2.0-uninstalled.pc.in diff --git a/Makefile.am b/Makefile.am index cc4facad2..f5c510d2d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -54,14 +54,7 @@ EXTRA_DIST += \ gthread-2.0.pc.in \ gio-2.0.pc.in \ gio-unix-2.0.pc.in \ - gio-windows-2.0.pc.in \ - glib-2.0-uninstalled.pc.in \ - gobject-2.0-uninstalled.pc.in \ - gmodule-2.0-uninstalled.pc.in \ - gthread-2.0-uninstalled.pc.in \ - gmodule-no-export-2.0-uninstalled.pc.in \ - gio-2.0-uninstalled.pc.in \ - gio-unix-2.0-uninstalled.pc.in + gio-windows-2.0.pc.in # These may be in the builddir too diff --git a/README.in b/README.in index b85a6e9c4..fef70f435 100644 --- a/README.in +++ b/README.in @@ -48,6 +48,8 @@ Notes about GLib 2.32 * It is now mandatory to include glib.h instead of individual headers. +* The -uninstalled variants of the pkg-config files have been dropped. + Notes about GLib 2.30 ===================== diff --git a/configure.ac b/configure.ac index fed8a9a4b..d229d3c55 100644 --- a/configure.ac +++ b/configure.ac @@ -3572,21 +3572,14 @@ AC_SUBST(gio_INCLUDES) AC_CONFIG_FILES([ glib-2.0.pc -glib-2.0-uninstalled.pc gmodule-2.0.pc gmodule-export-2.0.pc gmodule-no-export-2.0.pc -gmodule-2.0-uninstalled.pc -gmodule-no-export-2.0-uninstalled.pc gthread-2.0.pc -gthread-2.0-uninstalled.pc gobject-2.0.pc -gobject-2.0-uninstalled.pc gio-2.0.pc gio-unix-2.0.pc gio-windows-2.0.pc -gio-2.0-uninstalled.pc -gio-unix-2.0-uninstalled.pc glib-zip glib-gettextize Makefile diff --git a/gio-2.0-uninstalled.pc.in b/gio-2.0-uninstalled.pc.in deleted file mode 100644 index 04da6ead8..000000000 --- a/gio-2.0-uninstalled.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: GIO Uninstalled -Description: glib I/O library, Not Installed -Version: @VERSION@ -Requires: glib-2.0-uninstalled,gobject-2.0-uninstalled,gmodule-no-export-2.0-uninstalled -Libs: ${pc_top_builddir}/${pcfiledir}/gio/libgio-2.0.la -Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ diff --git a/gio-unix-2.0-uninstalled.pc.in b/gio-unix-2.0-uninstalled.pc.in deleted file mode 100644 index a45dc9e6e..000000000 --- a/gio-unix-2.0-uninstalled.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: GIO unix specific APIs -Description: unix specific headers for glib I/O library, Not Installed -Version: @VERSION@ -Requires: gobject-2.0-uninstalled,gmodule-no-export-2.0-uninstalled,gio-2.0-uninstalled -Libs: ${pc_top_builddir}/${pcfiledir}/gio/libgio-2.0.la -Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ diff --git a/glib-2.0-uninstalled.pc.in b/glib-2.0-uninstalled.pc.in deleted file mode 100644 index 0c0e95f01..000000000 --- a/glib-2.0-uninstalled.pc.in +++ /dev/null @@ -1,9 +0,0 @@ -glib_genmarshal=${pc_top_builddir}/${pcfiledir}/gobject/glib-genmarshal -gobject_query=${pc_top_builddir}/${pcfiledir}/gobject/gobject-query -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 -Cflags: -I${pc_top_builddir}/${pcfiledir} -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir}/@srcdir@/glib diff --git a/gmodule-2.0-uninstalled.pc.in b/gmodule-2.0-uninstalled.pc.in deleted file mode 100644 index 68f309161..000000000 --- a/gmodule-2.0-uninstalled.pc.in +++ /dev/null @@ -1,8 +0,0 @@ -gmodule_supported=@G_MODULE_SUPPORTED@ - -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_THREAD_LIBS@ -Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/gmodule @G_THREAD_CFLAGS@ diff --git a/gmodule-no-export-2.0-uninstalled.pc.in b/gmodule-no-export-2.0-uninstalled.pc.in deleted file mode 100644 index 115820db4..000000000 --- a/gmodule-no-export-2.0-uninstalled.pc.in +++ /dev/null @@ -1,14 +0,0 @@ -prefix=/usr -exec_prefix=${prefix} -libdir=${exec_prefix}/lib -includedir=${prefix}/include - -gmodule_supported=true - -Name: GModule -Description: Dynamic module loader for GLib -Requires: glib-2.0 -Version: @VERSION@ -Libs: ${pc_top_builddir}/${pcfiledir}/gmodule/libgmodule-2.0.la @G_THREAD_LIBS@ -Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@/gmodule @G_THREAD_CFLAGS@ - diff --git a/gobject-2.0-uninstalled.pc.in b/gobject-2.0-uninstalled.pc.in deleted file mode 100644 index d9378a584..000000000 --- a/gobject-2.0-uninstalled.pc.in +++ /dev/null @@ -1,7 +0,0 @@ -Name: GObject Uninstalled -Description: Object/type system for GLib, Not Installed -Requires: glib-2.0-uninstalled,gthread-2.0-uninstalled -Version: @VERSION@ -Libs: ${pc_top_builddir}/${pcfiledir}/gobject/libgobject-2.0.la -## cflags contains builddir in addition to srcdir because of gmarshal.h -Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ -I${pc_top_builddir}/${pcfiledir} diff --git a/gthread-2.0-uninstalled.pc.in b/gthread-2.0-uninstalled.pc.in deleted file mode 100644 index a7285da61..000000000 --- a/gthread-2.0-uninstalled.pc.in +++ /dev/null @@ -1,6 +0,0 @@ -Name: GThread Uninstalled -Description: Thread support for GLib, Not Installed -Requires: glib-2.0-uninstalled -Version: @VERSION@ -Libs: ${pc_top_builddir}/${pcfiledir}/gthread/libgthread-2.0.la @G_THREAD_LIBS@ -Cflags: -I${pc_top_builddir}/${pcfiledir}/@srcdir@ @G_THREAD_CFLAGS@