diff --git a/.cvsignore b/.cvsignore index 27c3d38b1b..6c21d7de24 100644 --- a/.cvsignore +++ b/.cvsignore @@ -15,3 +15,5 @@ ABOUT-NLS intl stamp-h.in gtk+.spec +gdk.pc +gtk+.pc diff --git a/ChangeLog b/ChangeLog index 2f30ffd101..2818681a3c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2000-09-30 Martin Baulig + + * gtk+.pc.in, gdk.pc.in: Provide pkg-config scripts. + + * configure.in: Create *.pc scripts from the *.pc.in + templates. + * Makefile.am (pkgconfig_DATA): Install the *.pc + scripts in `$(libexecdir)/pkgconfig'. + Thu Sep 07 20:50:49 2000 George Lebl * gtk/gtkmenu.c: Backported Nils Barth's patch for submenu diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 2f30ffd101..2818681a3c 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,12 @@ +2000-09-30 Martin Baulig + + * gtk+.pc.in, gdk.pc.in: Provide pkg-config scripts. + + * configure.in: Create *.pc scripts from the *.pc.in + templates. + * Makefile.am (pkgconfig_DATA): Install the *.pc + scripts in `$(libexecdir)/pkgconfig'. + Thu Sep 07 20:50:49 2000 George Lebl * gtk/gtkmenu.c: Backported Nils Barth's patch for submenu diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 2f30ffd101..2818681a3c 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,12 @@ +2000-09-30 Martin Baulig + + * gtk+.pc.in, gdk.pc.in: Provide pkg-config scripts. + + * configure.in: Create *.pc scripts from the *.pc.in + templates. + * Makefile.am (pkgconfig_DATA): Install the *.pc + scripts in `$(libexecdir)/pkgconfig'. + Thu Sep 07 20:50:49 2000 George Lebl * gtk/gtkmenu.c: Backported Nils Barth's patch for submenu diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 2f30ffd101..2818681a3c 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,12 @@ +2000-09-30 Martin Baulig + + * gtk+.pc.in, gdk.pc.in: Provide pkg-config scripts. + + * configure.in: Create *.pc scripts from the *.pc.in + templates. + * Makefile.am (pkgconfig_DATA): Install the *.pc + scripts in `$(libexecdir)/pkgconfig'. + Thu Sep 07 20:50:49 2000 George Lebl * gtk/gtkmenu.c: Backported Nils Barth's patch for submenu diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 2f30ffd101..2818681a3c 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,12 @@ +2000-09-30 Martin Baulig + + * gtk+.pc.in, gdk.pc.in: Provide pkg-config scripts. + + * configure.in: Create *.pc scripts from the *.pc.in + templates. + * Makefile.am (pkgconfig_DATA): Install the *.pc + scripts in `$(libexecdir)/pkgconfig'. + Thu Sep 07 20:50:49 2000 George Lebl * gtk/gtkmenu.c: Backported Nils Barth's patch for submenu diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 2f30ffd101..2818681a3c 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,12 @@ +2000-09-30 Martin Baulig + + * gtk+.pc.in, gdk.pc.in: Provide pkg-config scripts. + + * configure.in: Create *.pc scripts from the *.pc.in + templates. + * Makefile.am (pkgconfig_DATA): Install the *.pc + scripts in `$(libexecdir)/pkgconfig'. + Thu Sep 07 20:50:49 2000 George Lebl * gtk/gtkmenu.c: Backported Nils Barth's patch for submenu diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 2f30ffd101..2818681a3c 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,12 @@ +2000-09-30 Martin Baulig + + * gtk+.pc.in, gdk.pc.in: Provide pkg-config scripts. + + * configure.in: Create *.pc scripts from the *.pc.in + templates. + * Makefile.am (pkgconfig_DATA): Install the *.pc + scripts in `$(libexecdir)/pkgconfig'. + Thu Sep 07 20:50:49 2000 George Lebl * gtk/gtkmenu.c: Backported Nils Barth's patch for submenu diff --git a/Makefile.am b/Makefile.am index c193a71e9f..6da5a98b01 100644 --- a/Makefile.am +++ b/Makefile.am @@ -98,7 +98,11 @@ EXTRA_DIST = \ examples/frame/Makefile \ examples/spinbutton/spinbutton.c \ examples/spinbutton/Makefile \ - examples/find-examples.sh + examples/find-examples.sh \ + gdk.pc.in gtk+.pc.in + +pkgconfigdir = $(libexecdir)/pkgconfig +pkgconfig_DATA= gdk.pc gtk+.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 a32e68f00c..589b6c3ff4 100644 --- a/configure.in +++ b/configure.in @@ -530,4 +530,6 @@ docs/Makefile gdk/Makefile gtk/Makefile gtk/gtkfeatures.h +gdk.pc +gtk+.pc ], [chmod +x gtk-config]) diff --git a/gdk.pc.in b/gdk.pc.in new file mode 100644 index 0000000000..70702137cc --- /dev/null +++ b/gdk.pc.in @@ -0,0 +1,14 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +VERSION="@VERSION@" +REQUIRES="glib" +CFLAGS="-I${includedir}/gtk-1.2 @x_cflags@ $CFLAGS" +LIBS_PATH="-L${libdir} @x_ldflags@ $LIBS_PATH" +LIBS_LINK_SELF="-lgdk-1.2 @GDK_WLIBS@ $LIBS_LINK_SELF" +LIBS_LINK_SYSTEM="@INTLLIBS@ @x_libs@ @GDK_WLIBS@ -lm $LIBS_LINK_SYSTEM" + +#Name: GDK +#Description: GIMP Drawing Kit diff --git a/gtk+.pc.in b/gtk+.pc.in new file mode 100644 index 0000000000..6071964b48 --- /dev/null +++ b/gtk+.pc.in @@ -0,0 +1,14 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +VERSION="@VERSION@" +REQUIRES="gdk" +CFLAGS="-I${includedir} $CFLAGS" +LIBS_PATH="-L${libdir} $LIBS_PATH" +LIBS_LINK_SELF="-lgtk-1.2 $LIBS_LINK_SELF" +LIBS_LINK_SYSTEM="$LIBS_LINK_SYSTEM" + +#Name: GTK+ +#Description: GIMP Tool Kit