From ec319031cc2e4c82dcebedd65aa4dfa59f5a199e Mon Sep 17 00:00:00 2001 From: Martin Baulig Date: Fri, 29 Sep 2000 20:58:42 +0000 Subject: [PATCH] Set this to `$(libexecdir)/pkgconfig'; this is the directory where 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. --- ChangeLog | 10 ++++++++++ ChangeLog.pre-2-0 | 10 ++++++++++ ChangeLog.pre-2-10 | 10 ++++++++++ ChangeLog.pre-2-2 | 10 ++++++++++ ChangeLog.pre-2-4 | 10 ++++++++++ ChangeLog.pre-2-6 | 10 ++++++++++ ChangeLog.pre-2-8 | 10 ++++++++++ Makefile.am | 4 ++-- configure.in | 2 +- gdk-2.0.pc.in | 15 +++++++++------ gdk-pixbuf-2.0.pc.in | 14 ++++++++++++++ gdk-pixbuf.pc.in | 11 ----------- gtk+-2.0.pc.in | 15 +++++++++------ 13 files changed, 105 insertions(+), 26 deletions(-) create mode 100644 gdk-pixbuf-2.0.pc.in delete mode 100644 gdk-pixbuf.pc.in diff --git a/ChangeLog b/ChangeLog index f197d8277..416fb0e26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +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 f197d8277..416fb0e26 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,13 @@ +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 f197d8277..416fb0e26 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,13 @@ +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 f197d8277..416fb0e26 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,13 @@ +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 f197d8277..416fb0e26 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,13 @@ +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 f197d8277..416fb0e26 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,13 @@ +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 f197d8277..416fb0e26 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,13 @@ +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 0b42c1c0e..fcc414fca 100644 --- a/Makefile.am +++ b/Makefile.am @@ -112,8 +112,8 @@ EXTRA_DIST = \ examples/spinbutton/Makefile \ examples/find-examples.sh -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA= gdk-pixbuf.pc gdk-2.0.pc gtk+-2.0.pc +pkgconfigdir = $(libexecdir)/pkgconfig +pkgconfig_DATA= gdk-pixbuf-2.0.pc gdk-2.0.pc gtk+-2.0.pc dist-hook: gtk+.spec if test -e $(srcdir)/INSTALL.in && test -e $(srcdir)/README.in ; then \ diff --git a/configure.in b/configure.in index 5b1dca127..7a30ef012 100644 --- a/configure.in +++ b/configure.in @@ -1005,7 +1005,7 @@ gtk+.spec docs/gtk-config.1 Makefile gtk-config-2.0 -gdk-pixbuf.pc +gdk-pixbuf-2.0.pc gdk-2.0.pc gtk+-2.0.pc po/Makefile.in diff --git a/gdk-2.0.pc.in b/gdk-2.0.pc.in index 0dc03329c..81e319278 100644 --- a/gdk-2.0.pc.in +++ b/gdk-2.0.pc.in @@ -4,9 +4,12 @@ libdir=@libdir@ includedir=@includedir@ target=@gdktarget@ -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@ +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 diff --git a/gdk-pixbuf-2.0.pc.in b/gdk-pixbuf-2.0.pc.in new file mode 100644 index 000000000..af33e03ad --- /dev/null +++ b/gdk-pixbuf-2.0.pc.in @@ -0,0 +1,14 @@ +prefix=@prefix@ +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 diff --git a/gdk-pixbuf.pc.in b/gdk-pixbuf.pc.in deleted file mode 100644 index 96afc3d31..000000000 --- a/gdk-pixbuf.pc.in +++ /dev/null @@ -1,11 +0,0 @@ -prefix=@prefix@ -exec_prefix=@exec_prefix@ -libdir=@libdir@ -includedir=@includedir@ - -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 ddf6c4b62..ee2d8ed8b 100644 --- a/gtk+-2.0.pc.in +++ b/gtk+-2.0.pc.in @@ -4,9 +4,12 @@ libdir=@libdir@ includedir=@includedir@ target=@gdktarget@ -Name: GTK+ -Description: GIMP Tool Kit -Version: @VERSION@ -Requires: gdk-2.0 -Libs: -L${libdir} -lgtk-${target}-1.3 -Cflags: -I${includedir} +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 -- 2.43.2