From f717bda19732f874762f2c48521d8370f15bf3f0 Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Sat, 30 Sep 2000 02:14:04 +0000 Subject: [PATCH] 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). --- ChangeLog | 5 ----- ChangeLog.pre-2-0 | 5 ----- ChangeLog.pre-2-10 | 5 ----- ChangeLog.pre-2-2 | 5 ----- ChangeLog.pre-2-4 | 5 ----- ChangeLog.pre-2-6 | 5 ----- ChangeLog.pre-2-8 | 5 ----- Makefile.am | 2 +- gdk-2.0.pc.in | 15 ++++++--------- gdk-pixbuf-2.0.pc.in | 15 ++++++--------- gtk+-2.0.pc.in | 15 ++++++--------- 11 files changed, 19 insertions(+), 63 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3553bf637..0b50514e9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -23,14 +23,9 @@ 2000-09-29 Martin Baulig - * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; - this is the directory where pkg-config actually looks. - * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid confusion with the GdkPixbuf of the GNOME 1.x platform. - * *.pc.in: Made the pkg-config scripts actually work. - 2000-09-29 Havoc Pennington * gtk/gtktextview.c: Implement the side windows. diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 3553bf637..0b50514e9 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -23,14 +23,9 @@ 2000-09-29 Martin Baulig - * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; - this is the directory where pkg-config actually looks. - * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid confusion with the GdkPixbuf of the GNOME 1.x platform. - * *.pc.in: Made the pkg-config scripts actually work. - 2000-09-29 Havoc Pennington * gtk/gtktextview.c: Implement the side windows. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 3553bf637..0b50514e9 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -23,14 +23,9 @@ 2000-09-29 Martin Baulig - * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; - this is the directory where pkg-config actually looks. - * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid confusion with the GdkPixbuf of the GNOME 1.x platform. - * *.pc.in: Made the pkg-config scripts actually work. - 2000-09-29 Havoc Pennington * gtk/gtktextview.c: Implement the side windows. diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 3553bf637..0b50514e9 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -23,14 +23,9 @@ 2000-09-29 Martin Baulig - * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; - this is the directory where pkg-config actually looks. - * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid confusion with the GdkPixbuf of the GNOME 1.x platform. - * *.pc.in: Made the pkg-config scripts actually work. - 2000-09-29 Havoc Pennington * gtk/gtktextview.c: Implement the side windows. diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 3553bf637..0b50514e9 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -23,14 +23,9 @@ 2000-09-29 Martin Baulig - * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; - this is the directory where pkg-config actually looks. - * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid confusion with the GdkPixbuf of the GNOME 1.x platform. - * *.pc.in: Made the pkg-config scripts actually work. - 2000-09-29 Havoc Pennington * gtk/gtktextview.c: Implement the side windows. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 3553bf637..0b50514e9 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -23,14 +23,9 @@ 2000-09-29 Martin Baulig - * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; - this is the directory where pkg-config actually looks. - * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid confusion with the GdkPixbuf of the GNOME 1.x platform. - * *.pc.in: Made the pkg-config scripts actually work. - 2000-09-29 Havoc Pennington * gtk/gtktextview.c: Implement the side windows. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 3553bf637..0b50514e9 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -23,14 +23,9 @@ 2000-09-29 Martin Baulig - * Makefile.am (pkgconfigdir): Set this to `$(libexecdir)/pkgconfig'; - this is the directory where pkg-config actually looks. - * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid confusion with the GdkPixbuf of the GNOME 1.x platform. - * *.pc.in: Made the pkg-config scripts actually work. - 2000-09-29 Havoc Pennington * gtk/gtktextview.c: Implement the side windows. diff --git a/Makefile.am b/Makefile.am index fcc414fca..eb9a24f29 100644 --- a/Makefile.am +++ b/Makefile.am @@ -112,7 +112,7 @@ EXTRA_DIST = \ examples/spinbutton/Makefile \ examples/find-examples.sh -pkgconfigdir = $(libexecdir)/pkgconfig +pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-2.0.pc gtk+-2.0.pc dist-hook: gtk+.spec diff --git a/gdk-2.0.pc.in b/gdk-2.0.pc.in index 81e319278..0dc03329c 100644 --- a/gdk-2.0.pc.in +++ b/gdk-2.0.pc.in @@ -4,12 +4,9 @@ libdir=@libdir@ includedir=@includedir@ target=@gdktarget@ -VERSION="@VERSION@" -REQUIRES="gdk-pixbuf pangox" -CFLAGS="-I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @more_cflags@ $CFLAGS" -LIBS_PATH="-L${libdir} $LIBS_PATH" -LIBS_LINK_SELF="-lgdk-${target}-1.3 @GDK_WLIBS@ $LIBS_LINK_SELF" -LIBS_LINK_SYSTEM="@more_ldflags@ @more_libs@ $LIBS_LINK_SYSTEM" - -#Name: GDK -#Description: GIMP Drawing Kit +Name: GDK +Description: GIMP Drawing Kit +Version: @VERSION@ +Requires: gdk-pixbuf,pangox +Libs: -L${libdir} @more_ldflags@ -lgdk-${target}-1.3 @more_libs@ @GDK_WLIBS@ +Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @more_cflags@ diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in index af33e03ad..96afc3d31 100644 --- a/gdk-pixbuf-2.0.pc.in +++ b/gdk-pixbuf-2.0.pc.in @@ -3,12 +3,9 @@ exec_prefix=@exec_prefix@ libdir=@libdir@ includedir=@includedir@ -VERSION="@VERSION@" -REQUIRES="gobject-2.0 gmodule-2.0" -CFLAGS="-I${includedir} $CFLAGS" -LIBS_PATH="-L${libdir} $LIBS_PATH" -LIBS_LINK_SELF="-lgdk_pixbuf-1.3 $LIBS_LINK_SELF" -LIBS_LINK_SYSTEM="@INTLLIBS@ @MATH_LIB@" - -#Name: GdkPixbuf -#Description: Image loading and scaling +Name: GdkPixbuf +Description: Image loading and scaling +Version: @VERSION@ +Requires: gobject-2.0,gmodule-2.0 +Libs: -L${libdir} -lgdk_pixbuf-1.3 @INTLLIBS@ @MATH_LIB@ +Cflags: -I${includedir} diff --git a/gtk+-2.0.pc.in b/gtk+-2.0.pc.in index ee2d8ed8b..ddf6c4b62 100644 --- a/gtk+-2.0.pc.in +++ b/gtk+-2.0.pc.in @@ -4,12 +4,9 @@ libdir=@libdir@ includedir=@includedir@ target=@gdktarget@ -VERSION="@VERSION@" -REQUIRES="gdk-2.0" -CFLAGS="-I${includedir} $CFLAGS" -LIBS_PATH="-L${libdir} $LIBS_PATH" -LIBS_LINK_SELF="-lgtk-${target}-1.3 $LIBS_LINK_SELF" -LIBS_LINK_SYSTEM="$LIBS_LINK_SYSTEM" - -#Name: GTK+ -#Description: GIMP Tool Kit +Name: GTK+ +Description: GIMP Tool Kit +Version: @VERSION@ +Requires: gdk-2.0 +Libs: -L${libdir} -lgtk-${target}-1.3 +Cflags: -I${includedir} -- 2.43.2