[gst-cvs] thomasvs gst-plugins: gst-plugins/pkgconfig/

[Thomas V. S. <tho...@us...>]

CVS Root:       /cvsroot/gstreamer
Module:         gst-plugins
Changes by:     thomasvs
Date:           Sun Apr 27 2003  08:19:02 PDT

Log message:
more uninstalled fixes

Modified files:
    pkgconfig       : Makefile.am gstreamer-play-uninstalled.pc.in

Links:
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/pkgconfig/Makefile.am.diff?r1=1.3&r2=1.4
http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/pkgconfig/gstreamer-play-uninstalled.pc.in.diff?r1=1.3&r2=1.4

====Begin Diffs====
Index: Makefile.am
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/pkgconfig/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Makefile.am	27 Apr 2003 11:34:56 -0000	1.3
+++ Makefile.am	27 Apr 2003 15:18:50 -0000	1.4
@@ -14,21 +14,23 @@
 	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
Index: gstreamer-play-uninstalled.pc.in
===================================================================
RCS file: /cvsroot/gstreamer/gst-plugins/pkgconfig/gstreamer-play-uninstalled.pc.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gstreamer-play-uninstalled.pc.in	27 Apr 2003 14:22:01 -0000	1.3
+++ gstreamer-play-uninstalled.pc.in	27 Apr 2003 15:18:50 -0000	1.4
@@ -6,8 +6,8 @@
 
 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