diff --git a/ChangeLog b/ChangeLog index 00b2e0331..1677615f7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,13 +9,6 @@ * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we actually have threads. -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. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 00b2e0331..1677615f7 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -9,13 +9,6 @@ * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we actually have threads. -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. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 00b2e0331..1677615f7 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -9,13 +9,6 @@ * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we actually have threads. -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. diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12 index 00b2e0331..1677615f7 100644 --- a/ChangeLog.pre-2-12 +++ b/ChangeLog.pre-2-12 @@ -9,13 +9,6 @@ * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we actually have threads. -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. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 00b2e0331..1677615f7 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -9,13 +9,6 @@ * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we actually have threads. -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. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 00b2e0331..1677615f7 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -9,13 +9,6 @@ * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we actually have threads. -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. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 00b2e0331..1677615f7 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -9,13 +9,6 @@ * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we actually have threads. -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. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 00b2e0331..1677615f7 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -9,13 +9,6 @@ * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we actually have threads. -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. diff --git a/Makefile.am b/Makefile.am index ecff8b132..d6993ba73 100644 --- a/Makefile.am +++ b/Makefile.am @@ -122,7 +122,7 @@ testgdateparser_LDADD = libglib-1.3.la m4datadir = $(datadir)/aclocal m4data_DATA = glib-2.0.m4 -pkgconfigdir = $(libexecdir)/pkgconfig +pkgconfigdir = $(libdir)/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 3d6c84c32..a77335bec 100644 --- a/glib-2.0.pc.in +++ b/glib-2.0.pc.in @@ -3,12 +3,8 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -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 +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 diff --git a/glib/Makefile.am b/glib/Makefile.am index ecff8b132..d6993ba73 100644 --- a/glib/Makefile.am +++ b/glib/Makefile.am @@ -122,7 +122,7 @@ testgdateparser_LDADD = libglib-1.3.la m4datadir = $(datadir)/aclocal m4data_DATA = glib-2.0.m4 -pkgconfigdir = $(libexecdir)/pkgconfig +pkgconfigdir = $(libdir)/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 4c7af3056..bca8fdea5 100644 --- a/gmodule-2.0.pc.in +++ b/gmodule-2.0.pc.in @@ -3,12 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -REQUIRES="glib-2.0" -VERSION="@VERSION@" -CFLAGS="$CFLAGS" -LIBS_PATH="-L${libdir} @G_MODULE_LDFLAGS@ $LIBS_PATH" -LIBS_LINK_SELF="-lgmodule-1.3 $LIBS_LINK_SELF" -LIBS_LINK_SYSTEM="@G_MODULE_LIBS@ $LIBS_LINK_SYSTEM" - -#Name: GModule -#Description: Dynamic module loader for GLib +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: diff --git a/gobject-2.0.pc.in b/gobject-2.0.pc.in index b5e328429..54929f7f7 100644 --- a/gobject-2.0.pc.in +++ b/gobject-2.0.pc.in @@ -3,12 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -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 +Name: GObject +Description: Object/type system for GLib +Requires: glib-2.0 +Version: @VERSION@ +Libs: -L${libdir} -lgobject-1.3 +Cflags: diff --git a/gthread-2.0.pc.in b/gthread-2.0.pc.in index eea6f5a9a..cbe7f4e63 100644 --- a/gthread-2.0.pc.in +++ b/gthread-2.0.pc.in @@ -3,12 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -REQUIRES="glib-2.0" -VERSION="@VERSION@" -CFLAGS="$CFLAGS" -LIBS_PATH="-L${libdir} $LIBS_PATH" -LIBS_LINK_SELF="-lgthread-1.3 $LIBS_LINK_SELF" -LIBS_LINK_SYSTEM="@G_THREAD_LIBS@ $LIBS_LINK_SYSTEM" - -#Name: GThread -#Description: Thread support for GLib +Name: GThread +Description: Thread support for GLib +Requires: glib-2.0 +Version: @VERSION@ +Libs: -L${libdir} -lgthread-1.3 @G_THREAD_LIBS@ +Cflags: