Put the pkg-config scripts back to the correct pkg-config syntax

(the pkg-config that comes with the RedHat 7.0 glib-gtkbeta RPM and
 not the one from pkgconfig.sourceforge.net which is old).
This commit is contained in:
Martin Baulig 2000-09-30 02:14:04 +00:00
parent b3ee868f94
commit 336f7e89fe
14 changed files with 25 additions and 94 deletions

View File

@ -9,13 +9,6 @@
* Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
actually have threads. actually have threads.
2000-09-29 Martin Baulig <baulig@suse.de>
* 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 <baulig@suse.de> 2000-09-29 Martin Baulig <baulig@suse.de>
Several minor ANSI C fixes. Several minor ANSI C fixes.

View File

@ -9,13 +9,6 @@
* Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
actually have threads. actually have threads.
2000-09-29 Martin Baulig <baulig@suse.de>
* 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 <baulig@suse.de> 2000-09-29 Martin Baulig <baulig@suse.de>
Several minor ANSI C fixes. Several minor ANSI C fixes.

View File

@ -9,13 +9,6 @@
* Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
actually have threads. actually have threads.
2000-09-29 Martin Baulig <baulig@suse.de>
* 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 <baulig@suse.de> 2000-09-29 Martin Baulig <baulig@suse.de>
Several minor ANSI C fixes. Several minor ANSI C fixes.

View File

@ -9,13 +9,6 @@
* Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
actually have threads. actually have threads.
2000-09-29 Martin Baulig <baulig@suse.de>
* 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 <baulig@suse.de> 2000-09-29 Martin Baulig <baulig@suse.de>
Several minor ANSI C fixes. Several minor ANSI C fixes.

View File

@ -9,13 +9,6 @@
* Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
actually have threads. actually have threads.
2000-09-29 Martin Baulig <baulig@suse.de>
* 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 <baulig@suse.de> 2000-09-29 Martin Baulig <baulig@suse.de>
Several minor ANSI C fixes. Several minor ANSI C fixes.

View File

@ -9,13 +9,6 @@
* Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
actually have threads. actually have threads.
2000-09-29 Martin Baulig <baulig@suse.de>
* 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 <baulig@suse.de> 2000-09-29 Martin Baulig <baulig@suse.de>
Several minor ANSI C fixes. Several minor ANSI C fixes.

View File

@ -9,13 +9,6 @@
* Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
actually have threads. actually have threads.
2000-09-29 Martin Baulig <baulig@suse.de>
* 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 <baulig@suse.de> 2000-09-29 Martin Baulig <baulig@suse.de>
Several minor ANSI C fixes. Several minor ANSI C fixes.

View File

@ -9,13 +9,6 @@
* Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we * Makefile.am (SUBDIRS): Only compile the gthread subdirectory if we
actually have threads. actually have threads.
2000-09-29 Martin Baulig <baulig@suse.de>
* 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 <baulig@suse.de> 2000-09-29 Martin Baulig <baulig@suse.de>
Several minor ANSI C fixes. Several minor ANSI C fixes.

View File

@ -122,7 +122,7 @@ testgdateparser_LDADD = libglib-1.3.la
m4datadir = $(datadir)/aclocal m4datadir = $(datadir)/aclocal
m4data_DATA = glib-2.0.m4 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 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 glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in

View File

@ -3,12 +3,8 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
VERSION="@VERSION@" Name: GLib
REQUIRES="" Description: C Utility Library
CFLAGS="-I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include $CFLAGS" Version: @VERSION@
LIBS_PATH="-L${libdir} $LIBS_PATH" Libs: -L${libdir} -lglib-1.3
LIBS_LINK_SELF="-lglib-1.3 $LIBS_LINK_SELF" Cflags: -I${includedir}/glib-2.0 -I${libdir}/glib-2.0/include
LIBS_LINK_SYSTEM="$LIBS_LINK_SYSTEM"
#Name: GLib
#Description: C Utility Library

View File

@ -122,7 +122,7 @@ testgdateparser_LDADD = libglib-1.3.la
m4datadir = $(datadir)/aclocal m4datadir = $(datadir)/aclocal
m4data_DATA = glib-2.0.m4 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 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 glibconfig.h.win32: $(top_builddir)/config.status $(top_srcdir)/glibconfig.h.win32.in

View File

@ -3,12 +3,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
REQUIRES="glib-2.0" Name: GModule
VERSION="@VERSION@" Description: Dynamic module loader for GLib
CFLAGS="$CFLAGS" Requires: glib-2.0
LIBS_PATH="-L${libdir} @G_MODULE_LDFLAGS@ $LIBS_PATH" Version: @VERSION@
LIBS_LINK_SELF="-lgmodule-1.3 $LIBS_LINK_SELF" Libs: -L${libdir} @G_MODULE_LDFLAGS@ -lgmodule-1.3 @G_MODULE_LIBS@
LIBS_LINK_SYSTEM="@G_MODULE_LIBS@ $LIBS_LINK_SYSTEM" Cflags:
#Name: GModule
#Description: Dynamic module loader for GLib

View File

@ -3,12 +3,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
REQUIRES="glib-2.0" Name: GObject
VERSION="@VERSION@" Description: Object/type system for GLib
CFLAGS="$CFLAGS" Requires: glib-2.0
LIBS_PATH="-L${libdir} $LIBS_PATH" Version: @VERSION@
LIBS_LINK_SELF="-lobject-1.3 $LIBS_LINK_SELF" Libs: -L${libdir} -lgobject-1.3
LIBS_LINK_SYSTEM="$LIBS_LINK_SYSTEM" Cflags:
#Name: GObject
#Description: Object/type system for GLib

View File

@ -3,12 +3,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
REQUIRES="glib-2.0" Name: GThread
VERSION="@VERSION@" Description: Thread support for GLib
CFLAGS="$CFLAGS" Requires: glib-2.0
LIBS_PATH="-L${libdir} $LIBS_PATH" Version: @VERSION@
LIBS_LINK_SELF="-lgthread-1.3 $LIBS_LINK_SELF" Libs: -L${libdir} -lgthread-1.3 @G_THREAD_LIBS@
LIBS_LINK_SYSTEM="@G_THREAD_LIBS@ $LIBS_LINK_SYSTEM" Cflags:
#Name: GThread
#Description: Thread support for GLib