Commit f717bda1 authored by Martin Baulig's avatar Martin Baulig

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).
parent 244996ff
...@@ -23,14 +23,9 @@ ...@@ -23,14 +23,9 @@
2000-09-29 Martin Baulig <baulig@suse.de> 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 * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid
confusion with the GdkPixbuf of the GNOME 1.x platform. 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> 2000-09-29 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c: Implement the side windows. * gtk/gtktextview.c: Implement the side windows.
......
...@@ -23,14 +23,9 @@ ...@@ -23,14 +23,9 @@
2000-09-29 Martin Baulig <baulig@suse.de> 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 * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid
confusion with the GdkPixbuf of the GNOME 1.x platform. 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> 2000-09-29 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c: Implement the side windows. * gtk/gtktextview.c: Implement the side windows.
......
...@@ -23,14 +23,9 @@ ...@@ -23,14 +23,9 @@
2000-09-29 Martin Baulig <baulig@suse.de> 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 * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid
confusion with the GdkPixbuf of the GNOME 1.x platform. 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> 2000-09-29 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c: Implement the side windows. * gtk/gtktextview.c: Implement the side windows.
......
...@@ -23,14 +23,9 @@ ...@@ -23,14 +23,9 @@
2000-09-29 Martin Baulig <baulig@suse.de> 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 * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid
confusion with the GdkPixbuf of the GNOME 1.x platform. 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> 2000-09-29 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c: Implement the side windows. * gtk/gtktextview.c: Implement the side windows.
......
...@@ -23,14 +23,9 @@ ...@@ -23,14 +23,9 @@
2000-09-29 Martin Baulig <baulig@suse.de> 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 * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid
confusion with the GdkPixbuf of the GNOME 1.x platform. 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> 2000-09-29 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c: Implement the side windows. * gtk/gtktextview.c: Implement the side windows.
......
...@@ -23,14 +23,9 @@ ...@@ -23,14 +23,9 @@
2000-09-29 Martin Baulig <baulig@suse.de> 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 * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid
confusion with the GdkPixbuf of the GNOME 1.x platform. 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> 2000-09-29 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c: Implement the side windows. * gtk/gtktextview.c: Implement the side windows.
......
...@@ -23,14 +23,9 @@ ...@@ -23,14 +23,9 @@
2000-09-29 Martin Baulig <baulig@suse.de> 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 * gdk-pixbuf.pc.in: Renamed to gdb-pixbuf-2.0.pc.in to avoid
confusion with the GdkPixbuf of the GNOME 1.x platform. 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> 2000-09-29 Havoc Pennington <hp@pobox.com>
* gtk/gtktextview.c: Implement the side windows. * gtk/gtktextview.c: Implement the side windows.
......
...@@ -112,7 +112,7 @@ EXTRA_DIST = \ ...@@ -112,7 +112,7 @@ EXTRA_DIST = \
examples/spinbutton/Makefile \ examples/spinbutton/Makefile \
examples/find-examples.sh 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 pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-2.0.pc gtk+-2.0.pc
dist-hook: gtk+.spec dist-hook: gtk+.spec
......
...@@ -4,12 +4,9 @@ libdir=@libdir@ ...@@ -4,12 +4,9 @@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
target=@gdktarget@ target=@gdktarget@
VERSION="@VERSION@" Name: GDK
REQUIRES="gdk-pixbuf pangox" Description: GIMP Drawing Kit
CFLAGS="-I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @more_cflags@ $CFLAGS" Version: @VERSION@
LIBS_PATH="-L${libdir} $LIBS_PATH" Requires: gdk-pixbuf,pangox
LIBS_LINK_SELF="-lgdk-${target}-1.3 @GDK_WLIBS@ $LIBS_LINK_SELF" Libs: -L${libdir} @more_ldflags@ -lgdk-${target}-1.3 @more_libs@ @GDK_WLIBS@
LIBS_LINK_SYSTEM="@more_ldflags@ @more_libs@ $LIBS_LINK_SYSTEM" Cflags: -I${includedir}/gtk-2.0 -I${libdir}/gtk-2.0/include @more_cflags@
#Name: GDK
#Description: GIMP Drawing Kit
...@@ -3,12 +3,9 @@ exec_prefix=@exec_prefix@ ...@@ -3,12 +3,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
VERSION="@VERSION@" Name: GdkPixbuf
REQUIRES="gobject-2.0 gmodule-2.0" Description: Image loading and scaling
CFLAGS="-I${includedir} $CFLAGS" Version: @VERSION@
LIBS_PATH="-L${libdir} $LIBS_PATH" Requires: gobject-2.0,gmodule-2.0
LIBS_LINK_SELF="-lgdk_pixbuf-1.3 $LIBS_LINK_SELF" Libs: -L${libdir} -lgdk_pixbuf-1.3 @INTLLIBS@ @MATH_LIB@
LIBS_LINK_SYSTEM="@INTLLIBS@ @MATH_LIB@" Cflags: -I${includedir}
#Name: GdkPixbuf
#Description: Image loading and scaling
...@@ -4,12 +4,9 @@ libdir=@libdir@ ...@@ -4,12 +4,9 @@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
target=@gdktarget@ target=@gdktarget@
VERSION="@VERSION@" Name: GTK+
REQUIRES="gdk-2.0" Description: GIMP Tool Kit
CFLAGS="-I${includedir} $CFLAGS" Version: @VERSION@
LIBS_PATH="-L${libdir} $LIBS_PATH" Requires: gdk-2.0
LIBS_LINK_SELF="-lgtk-${target}-1.3 $LIBS_LINK_SELF" Libs: -L${libdir} -lgtk-${target}-1.3
LIBS_LINK_SYSTEM="$LIBS_LINK_SYSTEM" Cflags: -I${includedir}
#Name: GTK+
#Description: GIMP Tool Kit
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment