[gegl-gtk] Build: .pc files where not installed on "make install"

[Jon Nordby <jonnor src gnome org>]

commit 7e0f5e36f52492e661640f41e5dafcd2cce6aacd
Author: Jon Nordby <jononor gmail com>
Date:   Thu Apr 12 19:04:55 2012 +0200

    Build: .pc files where not installed on "make install"
    
    Te suspected reason is that the gtk-doc install rules overrode the normal rules.
    In either case, they are better off inside the library subdirectory.
    Also removes hardcoding of API version in the files.

 Makefile.am                                     |   10 ----------
 configure.ac                                    |   17 +++++++++--------
 gegl-gtk/Makefile.am                            |   15 +++++++++++++++
 gegl-gtk2-0.1.pc.in => gegl-gtk/gegl-gtk2.pc.in |    0
 gegl-gtk3-0.1.pc.in => gegl-gtk/gegl-gtk3.pc.in |    0
 5 files changed, 24 insertions(+), 18 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index b89dfe8..01a767f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,20 +8,10 @@ SUBDIRS=\
 	examples \
 	tests
 
-pkgconfigdir = $(libdir)/pkgconfig
-
-if HAVE_GTK2
-pkgconfig_DATA = gegl-gtk2-0.1.pc
-else
-pkgconfig_DATA = gegl-gtk3-0.1.pc
-endif
-
 EXTRA_DIST = \
 	autogen.sh \
 	docs/reference/gegl-gtk-docs.xml.in \
 	docs/gtk-doc.make \
-	gegl-gtk2-0.1.pc.in \
-	gegl-gtk3-0.1.pc.in \
 	m4/introspection.m4
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-introspection --enable-gtk-doc
diff --git a/configure.ac b/configure.ac
index aaf4bfe..7d06168 100644
--- a/configure.ac
+++ b/configure.ac
@@ -215,12 +215,6 @@ esac
 
 m4_define([gegl_gtk_gtk_version], [$GEGL_GTK_GTK_VERSION])
 
-# Files with versions in their names
-AC_CONFIG_FILES(
-gegl-gtk/GeglGtk\
-gegl_gtk_gtk_version-gegl_gtk_api_version.metadata:gegl-gtk/GeglGtk.metadata.in
-)
-
 AC_SUBST(GEGL_GTK_GTK_VERSION)
 
 AM_CONDITIONAL(HAVE_GTK2, test "$have_gtk" = "2.0")
@@ -341,6 +335,15 @@ if test -z "${MAINTAINER_MODE_TRUE}"; then
    GTK_CFLAGS="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED $GTK_CFLAGS"
 fi
 
+
+# Files with versions in their names
+AC_CONFIG_FILES(
+gegl-gtk/GeglGtk\
+gegl_gtk_gtk_version-gegl_gtk_api_version.metadata:gegl-gtk/GeglGtk.metadata.in
+gegl-gtk/gegl-gtk2-gegl_gtk_api_version.pc:gegl-gtk/gegl-gtk2.pc.in
+gegl-gtk/gegl-gtk3-gegl_gtk_api_version.pc:gegl-gtk/gegl-gtk3.pc.in
+)
+
 AC_OUTPUT([
 Makefile
 gegl-gtk/Makefile
@@ -351,8 +354,6 @@ examples/vala/Makefile
 tests/Makefile
 docs/reference/Makefile
 docs/reference/gegl-gtk-docs.xml
-gegl-gtk2-0.1.pc
-gegl-gtk3-0.1.pc
 ])
 
 dnl Print a summary of features enabled/disabled:
diff --git a/gegl-gtk/Makefile.am b/gegl-gtk/Makefile.am
index 815b8aa..279a13c 100644
--- a/gegl-gtk/Makefile.am
+++ b/gegl-gtk/Makefile.am
@@ -1,3 +1,5 @@
+
+### Library
 CLEANFILES = 
 EXTRA_DIST =
 
@@ -41,6 +43,19 @@ gegl-gtk-marshal.c: gegl-gtk-marshal.h
 
 EXTRA_DIST += gegl-gtk-marshal.list
 
+### pkg-config
+pkgconfigdir = $(libdir)/pkgconfig
+
+if HAVE_GTK2
+pkgconfig_DATA = gegl-gtk2-0.1.pc
+else
+pkgconfig_DATA = gegl-gtk3-0.1.pc
+endif
+
+EXTRA_DIST += \
+	gegl-gtk2.pc.in \
+	gegl-gtk3.pc.in
+
 ### GObject introspection
 -include $(INTROSPECTION_MAKEFILE)
 
diff --git a/gegl-gtk2-0.1.pc.in b/gegl-gtk/gegl-gtk2.pc.in
similarity index 100%
rename from gegl-gtk2-0.1.pc.in
rename to gegl-gtk/gegl-gtk2.pc.in
diff --git a/gegl-gtk3-0.1.pc.in b/gegl-gtk/gegl-gtk3.pc.in
similarity index 100%
rename from gegl-gtk3-0.1.pc.in
rename to gegl-gtk/gegl-gtk3.pc.in