merge from release branch

[platform/upstream/gstreamer.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 84b90b4..89ca870 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,14 +10,14 @@ else
 EXT_DIR=
 endif
 
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = gstreamer-libs.pc
+
 SUBDIRS=gst-libs gst sys $(EXT_DIR) examples tools $(GCONF_DIR) ## testsuite
 
 DIST_SUBDIRS=gst-libs gst sys ext examples tools gconf ## testsuite
 
 EXTRA_DIST=gst-plugins.spec depcomp \
-       AUTHORS COPYING README RELEASE LICENSE LICENSE_readme \
-       ChangeLog autogen.sh common m4
-
-dist-hook:
-       rm -rf `find $(distdir)/common -name CVS`
-       rm -rf `find $(distdir)/m4 -name CVS`
+           gstreamer-libs.pc.in gstreamer-libs-uninstalled.pc.in \
+          AUTHORS COPYING README RELEASE \
+          ChangeLog autogen.sh