luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-09-20 01:06:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

drop -uninstalled.pc files

Browse Source 
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.
This commit is contained in:
Ryan Lortie 2011-10-16 19:14:18 -04:00
parent c5aa8390b2
commit 306aa62ea5
10 changed files with 3 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Makefile.am
View File

@ -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

2
README.in
View File

@ -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
=====================

7
configure.ac
View File

@ -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

6
gio-2.0-uninstalled.pc.in
View File

@ -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@

6
gio-unix-2.0-uninstalled.pc.in
View File

@ -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@

9
glib-2.0-uninstalled.pc.in
View File

@ -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

8
gmodule-2.0-uninstalled.pc.in
View File

@ -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@

14
gmodule-no-export-2.0-uninstalled.pc.in
View File

@ -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@

7
gobject-2.0-uninstalled.pc.in
View File

@ -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}

6
gthread-2.0-uninstalled.pc.in
View File

@ -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@