summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-05
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-25
-rw-r--r--ChangeLog.pre-2-45
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--Makefile.am2
-rw-r--r--gdk-2.0.pc.in15
-rw-r--r--gdk-pixbuf-2.0.pc.in15
-rw-r--r--gtk+-2.0.pc.in15
11 files changed, 19 insertions, 63 deletions
diff --git a/ChangeLog b/ChangeLog
index 3553bf637f..0b50514e95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,14 +23,9 @@
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.
-
* 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 <hp@pobox.com>
* gtk/gtktextview.c: Implement the side windows.
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 3553bf637f..0b50514e95 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -23,14 +23,9 @@
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.
-
* 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 <hp@pobox.com>
* gtk/gtktextview.c: Implement the side windows.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 3553bf637f..0b50514e95 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -23,14 +23,9 @@
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.
-
* 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 <hp@pobox.com>
* gtk/gtktextview.c: Implement the side windows.
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 3553bf637f..0b50514e95 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -23,14 +23,9 @@
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.
-
* 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 <hp@pobox.com>
* gtk/gtktextview.c: Implement the side windows.
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 3553bf637f..0b50514e95 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -23,14 +23,9 @@
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.
-
* 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 <hp@pobox.com>
* gtk/gtktextview.c: Implement the side windows.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 3553bf637f..0b50514e95 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -23,14 +23,9 @@
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.
-
* 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 <hp@pobox.com>
* gtk/gtktextview.c: Implement the side windows.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 3553bf637f..0b50514e95 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -23,14 +23,9 @@
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.
-
* 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 <hp@pobox.com>
* gtk/gtktextview.c: Implement the side windows.
diff --git a/Makefile.am b/Makefile.am
index fcc414fca1..eb9a24f297 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 81e319278c..0dc03329c9 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 af33e03ad3..96afc3d31b 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 ee2d8ed8b5..ddf6c4b62d 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}