Merge remote-tracking branch 'origin/master' into 0.11

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

diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 6963193..e4b3831 100644 (file)
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -12,22 +12,26 @@ pcfiles =                                                   \
        gstreamer-base-@GST_MAJORMINOR@.pc                      \
        $(CHECK_PC_I)                                           \
        gstreamer-controller-@GST_MAJORMINOR@.pc                \
-       gstreamer-dataprotocol-@GST_MAJORMINOR@.pc
+       gstreamer-net-@GST_MAJORMINOR@.pc
 
 pcfiles_uninstalled =                                          \
        gstreamer-@GST_MAJORMINOR@-uninstalled.pc               \
        gstreamer-base-@GST_MAJORMINOR@-uninstalled.pc          \
        $(CHECK_PC_U)                                           \
        gstreamer-controller-@GST_MAJORMINOR@-uninstalled.pc    \
-       gstreamer-dataprotocol-@GST_MAJORMINOR@-uninstalled.pc
+       gstreamer-net-@GST_MAJORMINOR@-uninstalled.pc
 
 all-local: $(pcfiles) $(pcfiles_uninstalled)
 
+cp_verbose = $(cp_verbose_$(V))
+cp_verbose_ = $(cp_verbose_$(AM_DEFAULT_VERBOSITY))
+cp_verbose_0 = @echo "  CP     $@";
+
 ### how to generate pc files
 %-@GST_MAJORMINOR@.pc: %.pc
-       cp $< $@
+       $(cp_verbose_0)cp $< $@
 %-@GST_MAJORMINOR@-uninstalled.pc: %-uninstalled.pc
-       cp $< $@
+       $(cp_verbose_0)cp $< $@
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = $(pcfiles)
@@ -41,7 +45,7 @@ EXTRA_DIST =                                                  \
        gstreamer-check-uninstalled.pc.in                       \
        gstreamer-controller.pc.in                              \
        gstreamer-controller-uninstalled.pc.in                  \
-       gstreamer-dataprotocol.pc.in                            \
-       gstreamer-dataprotocol-uninstalled.pc.in
+       gstreamer-net.pc.in                                     \
+       gstreamer-net-uninstalled.pc.in
 
 CLEANFILES = $(pcfiles) $(pcfiles_uninstalled)