Port some changes from 0.6.0/0.6.1 back to HEAD (.pc files moved to pkg-config/,...

[platform/upstream/gst-plugins-good.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 6c5ae33..f3036f7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,34 +16,23 @@ else
 EXAMPLES_DIR=
 endif
 
-all-local: gstreamer-libs-@GST_MAJORMINOR@.pc gstreamer-play-@GST_MAJORMINOR@.pc gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc gst-element-check-@GST_MAJORMINOR@.m4
-
-gstreamer-libs-@GST_MAJORMINOR@.pc: gstreamer-libs.pc gstreamer-libs.pc.in
-       cp gstreamer-libs.pc gstreamer-libs-@GST_MAJORMINOR@.pc
-gstreamer-play-@GST_MAJORMINOR@.pc: gstreamer-play.pc gstreamer-play.pc.in
-       cp gstreamer-play.pc gstreamer-play-@GST_MAJORMINOR@.pc
-gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc: gstreamer-libs-uninstalled.pc gstreamer-libs-uninstalled.pc.in
-       cp gstreamer-libs-uninstalled.pc gstreamer-libs-@GST_MAJORMINOR@-uninstalled.pc
-gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc: gstreamer-play-uninstalled.pc gstreamer-play-uninstalled.pc.in
-       cp gstreamer-play-uninstalled.pc gstreamer-play-@GST_MAJORMINOR@-uninstalled.pc
-gst-element-check-@GST_MAJORMINOR@.m4: gst-element-check.m4
-       cp $(srcdir)/gst-element-check.m4 gst-element-check-@GST_MAJORMINOR@.m4
-
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = \
-       gstreamer-libs-@GST_MAJORMINOR@.pc \
-       gstreamer-play-@GST_MAJORMINOR@.pc
-
-aclocaldir = $(datadir)/aclocal
-aclocal_DATA = gst-element-check-@GST_MAJORMINOR@.m4
-
-SUBDIRS=gst-libs gst sys $(EXT_DIR) $(EXAMPLES_DIR) tools $(GCONF_DIR) testsuite
-
-DIST_SUBDIRS=gst-libs gst sys ext examples tools gconf testsuite
-
-EXTRA_DIST=gst-plugins.spec depcomp gst-element-check.m4 \
-           gstreamer-libs.pc.in gstreamer-libs-uninstalled.pc.in \
-           gstreamer-play.pc.in gstreamer-play-uninstalled.pc.in \
+SUBDIRS=gst-libs \
+       gst sys $(EXT_DIR) \
+       $(EXAMPLES_DIR) \
+       tools \
+       $(GCONF_DIR) \
+       testsuite \
+       pkgconfig
+
+DIST_SUBDIRS=gst-libs \
+       gst sys ext \
+       examples \
+       tools \
+       gconf \
+       testsuite \
+       pkgconfig
+
+EXTRA_DIST=gst-plugins.spec depcomp \
           AUTHORS COPYING README RELEASE REQUIREMENTS \
           ChangeLog autogen.sh common m4