From 1a4f9dddcd281e85182623929c4d1ca607f40c03 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Fri, 29 Sep 2000 20:36:52 +0000 Subject: [PATCH] Set this to `$(libexecdir)/pkgconfig'; this is the directory where 2000-09-29 Martin Baulig * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; this is the directory where pkg-config actually looks. * *.pc.in: Made the pkg-config scripts actually work. --- ChangeLog | 7 +++++++ ChangeLog.pre-2-0 | 7 +++++++ ChangeLog.pre-2-10 | 7 +++++++ ChangeLog.pre-2-12 | 7 +++++++ ChangeLog.pre-2-2 | 7 +++++++ ChangeLog.pre-2-4 | 7 +++++++ ChangeLog.pre-2-6 | 7 +++++++ ChangeLog.pre-2-8 | 7 +++++++ Makefile.am | 2 +- glib-2.0.pc.in | 14 +++++++++----- glib/Makefile.am | 2 +- gmodule-2.0.pc.in | 15 +++++++++------ gobject-2.0.pc.in | 15 +++++++++------ gthread-2.0.pc.in | 15 +++++++++------ 14 files changed, 94 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2b0c060..38da20a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2000-09-29 Martin Baulig + * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; + this is the directory where pkg-config actually looks. + + * *.pc.in: Made the pkg-config scripts actually work. + +2000-09-29 Martin Baulig + Several minor ANSI C fixes. Added missing casts: diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2b0c060..38da20a 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,5 +1,12 @@ 2000-09-29 Martin Baulig + * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; + this is the directory where pkg-config actually looks. + + * *.pc.in: Made the pkg-config scripts actually work. + +2000-09-29 Martin Baulig + Several minor ANSI C fixes. Added missing casts: diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2b0c060..38da20a 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,12 @@ 2000-09-29 Martin Baulig + * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; + this is the directory where pkg-config actually looks. + + * *.pc.in: Made the pkg-config scripts actually work. + +2000-09-29 Martin Baulig + Several minor ANSI C fixes. Added missing casts: diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 2b0c060..38da20a 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -1,5 +1,12 @@ 2000-09-29 Martin Baulig + * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; + this is the directory where pkg-config actually looks. + + * *.pc.in: Made the pkg-config scripts actually work. + +2000-09-29 Martin Baulig + Several minor ANSI C fixes. Added missing casts: diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2b0c060..38da20a 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,5 +1,12 @@ 2000-09-29 Martin Baulig + * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; + this is the directory where pkg-config actually looks. + + * *.pc.in: Made the pkg-config scripts actually work. + +2000-09-29 Martin Baulig + Several minor ANSI C fixes. Added missing casts: diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2b0c060..38da20a 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,5 +1,12 @@ 2000-09-29 Martin Baulig + * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; + this is the directory where pkg-config actually looks. + + * *.pc.in: Made the pkg-config scripts actually work. + +2000-09-29 Martin Baulig + Several minor ANSI C fixes. Added missing casts: diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2b0c060..38da20a 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,12 @@ 2000-09-29 Martin Baulig + * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; + this is the directory where pkg-config actually looks. + + * *.pc.in: Made the pkg-config scripts actually work. + +2000-09-29 Martin Baulig + Several minor ANSI C fixes. Added missing casts: diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2b0c060..38da20a 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,12 @@ 2000-09-29 Martin Baulig + * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; + this is the directory where pkg-config actually looks. + + * *.pc.in: Made the pkg-config scripts actually work. + +2000-09-29 Martin Baulig + Several minor ANSI C fixes. Added missing casts: diff --git a/Makefile.am b/Makefile.am index 104d783..f0e75e5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -116,7 +116,7 @@ testgdateparser_LDADD = libglib-1.3.la m4datadir = $(datadir)/aclocal m4data_DATA = glib-2.0.m4 -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(libexecdir)/pkgconfig pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gthread-2.0.pc glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in diff --git a/glib-2.0.pc.in b/glib-2.0.pc.in index a77335b..3d6c84c 100644 --- a/glib-2.0.pc.in +++ b/glib-2.0.pc.in @@ -3,8 +3,12 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: GLib -Description: C Utility Library -Version: @VERSION@ -Libs: -L${libdir} -lglib-1.3 -Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include +VERSION="@VERSION@" +REQUIRES="" +CFLAGS="-I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include $CFLAGS" +LIBS_PATH="-L${libdir} $LIBS_PATH" +LIBS_LINK_SELF="-lglib-1.3 $LIBS_LINK_SELF" +LIBS_LINK_SYSTEM="$LIBS_LINK_SYSTEM" + +#Name: GLib +#Description: C Utility Library diff --git a/glib/Makefile.am b/glib/Makefile.am index 104d783..f0e75e5 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -116,7 +116,7 @@ testgdateparser_LDADD = libglib-1.3.la m4datadir = $(datadir)/aclocal m4data_DATA = glib-2.0.m4 -pkgconfigdir = $(libdir)/pkgconfig +pkgconfigdir = $(libexecdir)/pkgconfig pkgconfig_DATA = glib-2.0.pc gobject-2.0.pc gmodule-2.0.pc gthread-2.0.pc glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in diff --git a/gmodule-2.0.pc.in b/gmodule-2.0.pc.in index bca8fde..8526582 100644 --- a/gmodule-2.0.pc.in +++ b/gmodule-2.0.pc.in @@ -3,9 +3,12 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: GModule -Description: Dynamic module loader for GLib -Requires: glib-2.0 -Version: @VERSION@ -Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-1.3 @G_MODULE_LIBS@ -Cflags: +REQUIRES="glib-2.0" +VERSION="@VERSION@" +CFLAGS="$CFLAGS" +LIBS_PATH="-L${libdir} $LIBS_PATH" +LIBS_LINK_SELF="@G_MODULE_LDFLAGS@ -lgmodule-1.3 @G_MODULE_LIBS@ $LIBS_LINK_SELF" +LIBS_LINK_SYSTEM="$LIBS_LINK_SYSTEM" + +#Name: GModule +#Description: Dynamic module loader for GLib diff --git a/gobject-2.0.pc.in b/gobject-2.0.pc.in index 54929f7..b5e3284 100644 --- a/gobject-2.0.pc.in +++ b/gobject-2.0.pc.in @@ -3,9 +3,12 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: GObject -Description: Object/type system for GLib -Requires: glib-2.0 -Version: @VERSION@ -Libs: -L${libdir} -lgobject-1.3 -Cflags: +REQUIRES="glib-2.0" +VERSION="@VERSION@" +CFLAGS="$CFLAGS" +LIBS_PATH="-L${libdir} $LIBS_PATH" +LIBS_LINK_SELF="-lobject-1.3 $LIBS_LINK_SELF" +LIBS_LINK_SYSTEM="$LIBS_LINK_SYSTEM" + +#Name: GObject +#Description: Object/type system for GLib diff --git a/gthread-2.0.pc.in b/gthread-2.0.pc.in index cbe7f4e..31aa83a 100644 --- a/gthread-2.0.pc.in +++ b/gthread-2.0.pc.in @@ -3,9 +3,12 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -Name: GThread -Description: Thread support for GLib -Requires: glib-2.0 -Version: @VERSION@ -Libs: -L${libdir} -lgthread-1.3 @G_THREAD_LIBS@ -Cflags: +REQUIRES="glib-2.0" +VERSION="@VERSION@" +CFLAGS="$CFLAGS" +LIBS_PATH="-L${libdir} $LIBS_PATH" +LIBS_LINK_SELF="-lgthread-1.3 @G_THREAD_LIBS@ $LIBS_LINK_SELF" +LIBS_LINK_SYSTEM="$LIBS_LINK_SYSTEM" + +#Name: GThread +#Description: Thread support for GLib -- 2.7.4