[hyena] [build] Fix pkg-config files handling

[Bertrand Lorentz <blorentz src gnome org>]

commit 4ed5e9bf2808c19edfb835779c4d42f5c9713290
Author: Bertrand Lorentz <bertrand lorentz gmail com>
Date:   Sun Jul 11 17:13:52 2010 +0200

    [build] Fix pkg-config files handling
    
    The .pc files were previously ending up with the same content, due to
    the way the makefile was set up. This commit moves them all into one
    directory, which makes fixing this much easier and cleaner.

 Hyena.Data.Sqlite/Makefile.am                      |    1 -
 Hyena.Gui/Makefile.am                              |    2 +-
 Hyena/Makefile.am                                  |    1 -
 Makefile.am                                        |   12 ------------
 build/Makefile.am                                  |    2 +-
 build/pkg-config/Makefile.am                       |   11 +++++++++++
 .../pkg-config}/hyena.data.sqlite.pc.in            |    0
 {Hyena.Gui => build/pkg-config}/hyena.gui.pc.in    |    0
 {Hyena => build/pkg-config}/hyena.pc.in            |    0
 configure.ac                                       |    1 +
 10 files changed, 14 insertions(+), 16 deletions(-)
---
diff --git a/Hyena.Data.Sqlite/Makefile.am b/Hyena.Data.Sqlite/Makefile.am
index 9f44292..2f1d38c 100644
--- a/Hyena.Data.Sqlite/Makefile.am
+++ b/Hyena.Data.Sqlite/Makefile.am
@@ -27,4 +27,3 @@ SOURCES =  \
 	Hyena.Metrics/Tests/MetricsTests.cs
 
 include $(top_srcdir)/build/build.mk
-EXTRA_DIST += hyena.data.sqlite.pc.in
diff --git a/Hyena.Gui/Makefile.am b/Hyena.Gui/Makefile.am
index c06d07a..756ac3e 100644
--- a/Hyena.Gui/Makefile.am
+++ b/Hyena.Gui/Makefile.am
@@ -119,5 +119,5 @@ SOURCES =  \
 	Hyena.Widgets/WrapLabel.cs
 
 include $(top_srcdir)/build/build.mk
-EXTRA_DIST += hyena.gui.pc.in Hyena.Gui.dll.config
+EXTRA_DIST += Hyena.Gui.dll.config
 module_SCRIPTS += Hyena.Gui.dll.config
diff --git a/Hyena/Makefile.am b/Hyena/Makefile.am
index f76ab62..ab950c3 100644
--- a/Hyena/Makefile.am
+++ b/Hyena/Makefile.am
@@ -125,4 +125,3 @@ SOURCES =  \
 	System.Web/HttpUtility.cs
 
 include $(top_srcdir)/build/build.mk
-EXTRA_DIST += hyena.pc.in 
diff --git a/Makefile.am b/Makefile.am
index 9a7e4a1..3a83e91 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -28,18 +28,6 @@ test:
 	echo "Tests not enabled.  Pass --enable-tests to configure or ./autogen.sh"
 endif
 
-# pkg-config
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_in_files = \
-	Hyena/hyena.pc.in \
-	Hyena.Data.Sqlite/hyena.data.sqlite.pc.in \
-	Hyena.Gui/hyena.gui.pc.in
-pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
-EXTRA_DIST = $(pkgconfig_in_files)
-CLEANFILES = $(pkgconfig_DATA)
-%.pc: $(pkgconfig_in_files)
-	sed "s,\ VERSION\@,$(VERSION),g; s,\ prefix\@,$(prefix),g; s,\ libdir\@,$(libdir),g; s,\ PACKAGE\@,$(PACKAGE),g" < $< > $@
-
 MAINTAINERCLEANFILES = \
 	compile \
 	INSTALL \
diff --git a/build/Makefile.am b/build/Makefile.am
index 973ddf9..43c2a4c 100644
--- a/build/Makefile.am
+++ b/build/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = m4
+SUBDIRS = m4 pkg-config
 
 GCONF_SCHEMA_EXTRACTOR_ASSEMBLY = gconf-schema-extractor.exe
 TRANSLATOR_EXTRACTOR_ASSEMBLY = translator-extractor.exe
diff --git a/build/pkg-config/Makefile.am b/build/pkg-config/Makefile.am
new file mode 100644
index 0000000..51ac2cd
--- /dev/null
+++ b/build/pkg-config/Makefile.am
@@ -0,0 +1,11 @@
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_in_files = $(wildcard hyena*.pc.in)
+pkgconfig_DATA = $(pkgconfig_in_files:.pc.in=.pc)
+
+%.pc: %.pc.in
+	sed "s,\ VERSION\@,$(VERSION),g; s,\ prefix\@,$(prefix),g; s,\ libdir\@,$(libdir),g; s,\ PACKAGE\@,$(PACKAGE),g" < $< > $@
+
+EXTRA_DIST = $(pkgconfig_in_files)
+
+CLEANFILES = $(pkgconfig_DATA)
+MAINTAINERCLEANFILES = Makefile.in
diff --git a/Hyena.Data.Sqlite/hyena.data.sqlite.pc.in b/build/pkg-config/hyena.data.sqlite.pc.in
similarity index 100%
rename from Hyena.Data.Sqlite/hyena.data.sqlite.pc.in
rename to build/pkg-config/hyena.data.sqlite.pc.in
diff --git a/Hyena.Gui/hyena.gui.pc.in b/build/pkg-config/hyena.gui.pc.in
similarity index 100%
rename from Hyena.Gui/hyena.gui.pc.in
rename to build/pkg-config/hyena.gui.pc.in
diff --git a/Hyena/hyena.pc.in b/build/pkg-config/hyena.pc.in
similarity index 100%
rename from Hyena/hyena.pc.in
rename to build/pkg-config/hyena.pc.in
diff --git a/configure.ac b/configure.ac
index 10ce1b5..35b9c2e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -103,6 +103,7 @@ AC_CONFIG_FILES([
 Makefile
 build/Makefile
 build/m4/Makefile
+build/pkg-config/Makefile
 
 Mono.Data.Sqlite/Makefile
 Hyena/Makefile