libs: Don't install headers and pc files for libgstwayland/badvideo/badbase

These will disappear after 1.4.0 and it would be rather annoying if
people started depending on them.

https://bugzilla.gnome.org/show_bug.cgi?id=732207

diff --git a/gst-libs/gst/base/Makefile.am b/gst-libs/gst/base/Makefile.am
index c4e8588..0d55368 100644 (file)
--- a/gst-libs/gst/base/Makefile.am
+++ b/gst-libs/gst/base/Makefile.am
@@ -9,16 +9,8 @@ libgstbadbase_@GST_API_VERSION@_la_CFLAGS = $(GST_CFLAGS) \
 libgstbadbase_@GST_API_VERSION@_la_LIBADD = $(GST_LIBS)
 libgstbadbase_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
-libgstbadbase_@GST_API_VERSION@includedir =            \
-       $(includedir)/gstreamer-@GST_API_VERSION@/gst/base
-libgstbadbase_@GST_API_VERSION@include_HEADERS =       \
+noinst_HEADERS =       \
        gstaggregator.h
 
 EXTRA_DIST = 
 
-CLEANFILES = *.gcno *.gcda *.gcov
-
-%.c.gcov: .libs/libgstbadbase_@GST_API_VERSION@_la-%.gcda %.c
-       $(GCOV) -b -f -o $^ > $@.out
-
-gcov: $(libgstbadbase_@GST_API_VERSION@_la_SOURCES:=.gcov)

diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am
index 579510e..bd3dc13 100644 (file)
--- a/gst-libs/gst/video/Makefile.am
+++ b/gst-libs/gst/video/Makefile.am
@@ -11,13 +11,10 @@ libgstbadvideo_@GST_API_VERSION@_la_SOURCES = \
 
 nodist_libgstbadvideo_@GST_API_VERSION@_la_SOURCES = $(BUILT_SOURCES)
 
-libgstbadvideo_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/video
-libgstbadvideo_@GST_API_VERSION@include_HEADERS = \
+noinst_HEADERS = \
        gstvideoaggregatorpad.h \
        gstvideoaggregator.h
 
-nodist_libgstbadvideo_@GST_API_VERSION@include_HEADERS = $(built_headers)
-
 libgstbadvideo_@GST_API_VERSION@_la_CFLAGS = \
        -DGST_USE_UNSTABLE_API \
        -I$(top_srcdir)/gst-libs \

diff --git a/gst-libs/gst/wayland/Makefile.am b/gst-libs/gst/wayland/Makefile.am
index e3e7571..0344598 100644 (file)
--- a/gst-libs/gst/wayland/Makefile.am
+++ b/gst-libs/gst/wayland/Makefile.am
@@ -5,8 +5,6 @@ libgstwayland_@GST_API_VERSION@_la_SOURCES = wayland.c
 libgstwayland_@GST_API_VERSION@includedir = \
        $(includedir)/gstreamer-@GST_API_VERSION@/gst/wayland
 
-libgstwayland_@GST_API_VERSION@include_HEADERS = wayland.h
-
 libgstwayland_@GST_API_VERSION@_la_CFLAGS = \
        $(GST_PLUGINS_BAD_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS) \
@@ -23,69 +21,6 @@ libgstwayland_@GST_API_VERSION@_la_LDFLAGS = \
        $(GST_ALL_LDFLAGS) \
        $(GST_LT_LDFLAGS)
 
+noinst_HEADERS = \
+       wayland.h
 
-if HAVE_INTROSPECTION
-BUILT_GIRSOURCES = GstWayland-@GST_API_VERSION@.gir
-
-gir_headers=$(patsubst %,$(srcdir)/%, $(libgstwayland_@GST_API_VERSION@include_HEADERS))
-gir_headers+=$(patsubst %,$(builddir)/%, $(built_headers))
-gir_sources=$(patsubst %,$(srcdir)/%, $(libgstwayland_@GST_API_VERSION@_la_SOURCES))
-gir_sources+=$(patsubst %,$(builddir)/%, $(built_sources))
-
-GstWayland-@GST_API_VERSION@.gir: $(INTROSPECTION_SCANNER) libgstwayland-@GST_API_VERSION@.la
-       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
-               GST_PLUGIN_SYSTEM_PATH_1_0="" GST_PLUGIN_PATH_1_0="" GST_REGISTRY_UPDATE=no \
-               $(INTROSPECTION_SCANNER) -v --namespace GstWayland \
-               --nsversion=@GST_API_VERSION@ \
-               --strip-prefix=Gst \
-               --warn-all \
-               --c-include "gst/wayland/wayland.h" \
-               -I$(top_srcdir)/gst-libs \
-               -I$(top_builddir)/gst-libs \
-               --add-include-path=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
-               --library=libgstwayland-@GST_API_VERSION@.la \
-               --include=Gst-@GST_API_VERSION@ \
-               --libtool="$(top_builddir)/libtool" \
-               --pkg gstreamer-@GST_API_VERSION@ \
-               --pkg-export gstreamer-wayland-@GST_API_VERSION@ \
-               --add-init-section="gst_init(NULL,NULL);" \
-               -DGST_USE_UNSTABLE_API \
-               --output $@ \
-               $(gir_headers) \
-               $(gir_sources)
-
-# INTROSPECTION_GIRDIR/INTROSPECTION_TYPELIBDIR aren't the right place to
-# install anything - we need to install inside our prefix.
-girdir = $(datadir)/gir-1.0
-gir_DATA = $(BUILT_GIRSOURCES)
-
-typelibsdir = $(libdir)/girepository-1.0/
-
-typelibs_DATA = $(BUILT_GIRSOURCES:.gir=.typelib)
-
-%.typelib: %.gir $(INTROSPECTION_COMPILER)
-       $(AM_V_GEN)PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" \
-               $(INTROSPECTION_COMPILER) \
-               --includedir=$(srcdir) \
-               --includedir=$(builddir) \
-               --includedir=`PKG_CONFIG_PATH="$(GST_PKG_CONFIG_PATH)" $(PKG_CONFIG) --variable=girdir gstreamer-@GST_API_VERSION@` \
-               $(INTROSPECTION_COMPILER_OPTS) $< -o $(@F)
-
-CLEANFILES = $(BUILT_GIRSOURCES) $(typelibs_DATA)
-endif
-
-Android.mk:  $(BUILT_SOURCES) Makefile.am
-       androgenizer -:PROJECT libgstwayland -:STATIC libgstwayland-@GST_API_VERSION@ \
-        -:TAGS eng debug \
-         -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-        -:SOURCES $(libgstwayland_@GST_API_VERSION@_la_SOURCES) \
-         $(built_sources) \
-        -:CFLAGS $(DEFS) $(libgstwayland_@GST_API_VERSION@_la_CFLAGS) \
-        -:LDFLAGS $(libgstwayland_@GST_API_VERSION@_la_LDFLAGS) \
-                  $(libgstwayland@GST_API_VERSION@_la_LIBADD) \
-                  -ldl \
-        -:HEADER_TARGET gstreamer-@GST_API_VERSION@/gst/wayland \
-        -:HEADERS $(libgstwaylandinclude_HEADERS) \
-         $(built_headers) \
-        -:PASSTHROUGH LOCAL_ARM_MODE:=arm \
-       > $@

diff --git a/pkgconfig/Makefile.am b/pkgconfig/Makefile.am
index 65fdc7b..3e53a6e 100644 (file)
--- a/pkgconfig/Makefile.am
+++ b/pkgconfig/Makefile.am
@@ -4,15 +4,13 @@ pcverfiles =  \
        gstreamer-plugins-bad-@GST_API_VERSION@.pc \
        gstreamer-codecparsers-@GST_API_VERSION@.pc \
        gstreamer-insertbin-@GST_API_VERSION@.pc \
-       gstreamer-mpegts-@GST_API_VERSION@.pc \
-       gstreamer-wayland-@GST_API_VERSION@.pc
+       gstreamer-mpegts-@GST_API_VERSION@.pc
 
 pcverfiles_uninstalled = \
        gstreamer-plugins-bad-@GST_API_VERSION@-uninstalled.pc \
        gstreamer-codecparsers-@GST_API_VERSION@-uninstalled.pc \
        gstreamer-insertbin-@GST_API_VERSION@-uninstalled.pc \
-       gstreamer-mpegts-@GST_API_VERSION@-uninstalled.pc \
-       gstreamer-wayland-@GST_API_VERSION@-uninstalled.pc
+       gstreamer-mpegts-@GST_API_VERSION@-uninstalled.pc
 
 if HAVE_GST_GL
 pcverfiles += gstreamer-gl-@GST_API_VERSION@.pc
@@ -40,8 +38,7 @@ pcinfiles = \
            gstreamer-codecparsers.pc.in gstreamer-codecparsers-uninstalled.pc.in \
            gstreamer-gl.pc.in gstreamer-gl-uninstalled.pc.in \
            gstreamer-insertbin.pc.in gstreamer-insertbin-uninstalled.pc.in \
-           gstreamer-mpegts.pc.in gstreamer-mpegts-uninstalled.pc.in \
-           gstreamer-wayland.pc.in gstreamer-wayland-uninstalled.pc.in
+           gstreamer-mpegts.pc.in gstreamer-mpegts-uninstalled.pc.in
 
 DISTCLEANFILES = $(pcinfiles:.in=)
 EXTRA_DIST = $(pcinfiles)