pkg-config fixes

Original commit message from CVS:
pkg-config fixes

Makefile.am

@@ -20,24 +20,12 @@ SUBDIRS_EXAMPLES =
 endif
 
 SUBDIRS = include gst libs tools \
-	$(SUBDIRS_TESTS) $(SUBDIRS_EXAMPLES) $(SUBDIRS_DOCS)
+	$(SUBDIRS_TESTS) $(SUBDIRS_EXAMPLES) $(SUBDIRS_DOCS) pkgconfig
 
 # These are all the possible subdirs
-DIST_SUBDIRS = include libs gst tools tests testsuite examples docs
-
-all-local: gstreamer-@GST_MAJORMINOR@.pc gstreamer-@GST_MAJORMINOR@-uninstalled.pc
-
-gstreamer-@GST_MAJORMINOR@.pc: gstreamer.pc gstreamer.pc.in
-	cp gstreamer.pc gstreamer-@GST_MAJORMINOR@.pc
-gstreamer-@GST_MAJORMINOR@-uninstalled.pc: gstreamer-uninstalled.pc gstreamer-uninstalled.pc.in
-	cp gstreamer-uninstalled.pc gstreamer-@GST_MAJORMINOR@-uninstalled.pc
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = gstreamer-@GST_MAJORMINOR@.pc
+DIST_SUBDIRS = include libs gst tools tests testsuite examples docs pkgconfig
 
 EXTRA_DIST = gstreamer.spec.in \
-	     gstreamer.pc.in \
-	     gstreamer-uninstalled.pc.in \
 	     configure.ac autogen.sh depcomp \
 	     REQUIREMENTS ABOUT-NLS RELEASE DOCBUILDING DEVEL \
 	     idiottest.mak common

configure.ac

@@ -11,6 +11,7 @@ AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
 
 dnl our libraries and install dirs use major.minor as a version
 GST_MAJORMINOR=$GST_VERSION_MAJOR.$GST_VERSION_MINOR
+GST_MAJORMINOR=0.6
 AC_SUBST(GST_MAJORMINOR)
 
 AC_PROG_CC
@@ -544,9 +545,12 @@ docs/pwg/Makefile
 docs/plugins/Makefile
 docs/plugins/gstreamer-plugins.types
 docs/xsl/Makefile
+pkgconfig/Makefile
+pkgconfig/gstreamer.pc
+pkgconfig/gstreamer-uninstalled.pc
+pkgconfig/gstreamer-control.pc
+pkgconfig/gstreamer-control-uninstalled.pc
 stamp.h
-gstreamer.pc
-gstreamer-uninstalled.pc
 gstreamer.spec,
 echo "$infomessages", infomessages="$infomessages"
 )

gstreamer.spec.in

@@ -202,6 +202,7 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
 %{_libdir}/libgstreamer-%{majorminor}.so
 %{_libdir}/libgstcontrol-%{majorminor}.so
 %{_libdir}/pkgconfig/gstreamer-%{majorminor}.pc
+%{_libdir}/pkgconfig/gstreamer-control-%{majorminor}.pc
 ## we specify the API docs as regular files since %docs doesn't fail when
 #  files aren't found anymore for RPM >= 4
 #  we list all of the files we really need to trap incomplete doc builds
@@ -258,12 +259,16 @@ ln -sf %{_datadir}/gtk-doc/html/gstreamer-libs %{_datadir}/devhelp/books
 
 
 %changelog
+* Tue Jan 28 2003 Thomas Vander Stichele <thomas at apestaart dot org>
+- added gstreamer-control.pc file
+
 * Sat Dec 07 2002 Thomas Vander Stichele <thomas at apestaart dot org>
 - define majorminor and use it everywhere
 - full parallel installability
 
 * Tue Nov 05 2002 Christian Schaller <Uraeus@linuxrising.org>
 - Add optwingo scheduler
+
 * Sat Oct 12 2002 Christian Schaller <Uraeus@linuxrising.org>
 - Updated to work better with default RH8 rpm
 - Added missing unspeced files