From 077be4ccbd714dd3b7510d76f3470e45366ff8f7 Mon Sep 17 00:00:00 2001
From: Thomas Vander Stichele <thomas@apestaart.org>
Date: Sun, 27 Apr 2003 15:20:07 +0000
Subject: more uninstalled fixes

Original commit message from CVS:
more uninstalled fixes
---
 pkgconfig/Makefile.am                       | 20 +++++++++++---------
 pkgconfig/gstreamer-gconf-uninstalled.pc.in |  4 ++--
 pkgconfig/gstreamer-play-uninstalled.pc.in  |  4 ++--
 3 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'pkgconfig')

diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 7c136f27..26e80bb1 100644
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -14,21 +14,23 @@ pcfiles_uninstalled = \
 	gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc \
 	gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc
 
-all-local: $(pcfiles) $(pcfiles_uninstalled) \
-	$(GCONF_PC) \
-	$(GCONF_PC_UNINSTALLED)
+pcfiles_gconf = $(GCONF_PC) $(GCONF_PC_UNINSTALLED)
+all-local: $(pcfiles) $(pcfiles_uninstalled) $(pcfiles_gconf)
 
-### how to generate pc files
+### how to generate pc files from .pc files in this dir
 $(pcfiles): %-@GST_MAJORMINOR@.pc: %.pc
 	cp $< $@
 $(pcfiles_uninstalled): %-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc
 	cp $< $@
 
-gstreamer-gconf-@GST_MAJORMINOR@.pc: \
-	$(srcdir)/../gst-libs/gst/gconf/gstreamer-gconf.pc
-	cp $< $@
-gstreamer-gconf-@GST_MAJORMINOR@-uninstalled.pc: \
-	$(srcdir)/../gst-libs/gst/gconf/gstreamer-gconf-uninstalled.pc
+### how to generate gconf dir pc files from their pc.in files
+### somebody smart could figure out how to fold this back into one rule
+$(srcdir)/../gst-libs/gst/gconf/gstreamer-gconf*.pc:
+	cd $(srcdir)/../gst-libs/gst/gconf && make gstreamer-gconf.pc gstreamer-gconf-uninstalled.pc
+
+### how to generate pc files from base .pc file in other dir
+$(pcfiles_gconf): gstreamer-gconf-@GST_MAJORMINOR@%.pc: \
+	$(srcdir)/../gst-libs/gst/gconf/gstreamer-gconf%.pc
 	cp $< $@
 
 pkgconfigdir = $(libdir)/pkgconfig
diff --git a/pkgconfig/gstreamer-gconf-uninstalled.pc.in b/pkgconfig/gstreamer-gconf-uninstalled.pc.in
index 932f3eb7..ad3439b4 100644
--- a/pkgconfig/gstreamer-gconf-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-gconf-uninstalled.pc.in
@@ -9,5 +9,5 @@ Description: Streaming media framework, GConf support library, not installed
 Requires: gstreamer >= @VERSION@
 Version: @VERSION@
 
-Libs: ${pcfiledir}/gst-libs/gst/gconf/libgstgconf-@GST_MAJORMINOR@.la
-Cflags: -I${pcfiledir}/gst-libs
+Libs: ${pcfiledir}/../gst-libs/gst/gconf/libgstgconf-@GST_MAJORMINOR@.la
+Cflags: -I${pcfiledir}/../gst-libs
diff --git a/pkgconfig/gstreamer-play-uninstalled.pc.in b/pkgconfig/gstreamer-play-uninstalled.pc.in
index 0ed0a119..6bc27e77 100644
--- a/pkgconfig/gstreamer-play-uninstalled.pc.in
+++ b/pkgconfig/gstreamer-play-uninstalled.pc.in
@@ -6,8 +6,8 @@ includedir=${pcfiledir}
 
 Name: GStreamer Play Library, uninstalled
 Description: Streaming-media framework, play libraries, not installed
-Requires: gstreamer >= @VERSION@
+Requires: gstreamer >= @VERSION@ gstreamer-control >= @VERSION@
 Version: @VERSION@
 
-Libs: ${pcfiledir}/../gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la -lgstcontrol-@GST_MAJORMINOR@
+Libs: ${pcfiledir}/../gst-libs/gst/play/libgstplay-@GST_MAJORMINOR@.la
 Cflags: -I${pcfiledir}/../gst-libs
-- 
cgit v1.2.1