Commit 317894d3 authored by Sebastian Dröge's avatar Sebastian Dröge

gio: Move to gst subdirectory

It's a plugin without external dependencies now because we
unconditionally depend on GIO anyway.
parent 5ed617b6
......@@ -399,6 +399,7 @@ AG_GST_CHECK_PLUGIN(audiotestsrc)
AG_GST_CHECK_PLUGIN(encoding)
AG_GST_CHECK_PLUGIN(videoconvert)
AG_GST_CHECK_PLUGIN(gdp)
AG_GST_CHECK_PLUGIN(gio)
AG_GST_CHECK_PLUGIN(playback)
AG_GST_CHECK_PLUGIN(audioresample)
AG_GST_CHECK_PLUGIN(subparse)
......@@ -721,7 +722,6 @@ dnl not building plugins with external dependencies,
dnl but we still need to set the conditionals
AM_CONDITIONAL(USE_ALSA, false)
AM_CONDITIONAL(USE_CDPARANOIA, false)
AM_CONDITIONAL(USE_GIO, false)
AM_CONDITIONAL(USE_IVORBIS, false)
AM_CONDITIONAL(USE_LIBVISUAL, false)
AM_CONDITIONAL(USE_OGG, false)
......@@ -827,6 +827,7 @@ gst/audiotestsrc/Makefile
gst/encoding/Makefile
gst/videoconvert/Makefile
gst/gdp/Makefile
gst/gio/Makefile
gst/playback/Makefile
gst/audioresample/Makefile
gst/subparse/Makefile
......@@ -842,7 +843,6 @@ sys/xvimage/Makefile
ext/Makefile
ext/alsa/Makefile
ext/cdparanoia/Makefile
ext/gio/Makefile
ext/libvisual/Makefile
ext/ogg/Makefile
ext/pango/Makefile
......
......@@ -54,10 +54,6 @@ EXTRA_HFILES = \
$(top_srcdir)/ext/alsa/gstalsasink.h \
$(top_srcdir)/ext/alsa/gstalsasrc.h \
$(top_srcdir)/ext/cdparanoia/gstcdparanoiasrc.h \
$(top_srcdir)/ext/gio/gstgiosink.h \
$(top_srcdir)/ext/gio/gstgiosrc.h \
$(top_srcdir)/ext/gio/gstgiostreamsink.h \
$(top_srcdir)/ext/gio/gstgiostreamsrc.h \
$(top_srcdir)/ext/ogg/gstoggdemux.h \
$(top_srcdir)/ext/ogg/gstoggmux.h \
$(top_srcdir)/ext/pango/gstclockoverlay.h \
......@@ -78,6 +74,10 @@ EXTRA_HFILES = \
$(top_srcdir)/gst/encoding/gstencodebin.h \
$(top_srcdir)/gst/gdp/gstgdpdepay.h \
$(top_srcdir)/gst/gdp/gstgdppay.h \
$(top_srcdir)/gst/gio/gstgiosink.h \
$(top_srcdir)/gst/gio/gstgiosrc.h \
$(top_srcdir)/gst/gio/gstgiostreamsink.h \
$(top_srcdir)/gst/gio/gstgiostreamsrc.h \
$(top_srcdir)/gst/playback/gstplay-enum.h \
$(top_srcdir)/gst/playback/gstsubtitleoverlay.h \
$(top_srcdir)/gst/audiorate/gstaudiorate.h \
......
......@@ -10,12 +10,6 @@ else
CDPARANOIA_DIR=
endif
if USE_GIO
GIO_DIR=gio
else
GIO_DIR=
endif
if USE_LIBVISUAL
LIBVISUAL_DIR=libvisual
else
......@@ -57,7 +51,6 @@ endif
SUBDIRS = \
$(ALSA_DIR) \
$(CDPARANOIA_DIR) \
$(GIO_DIR) \
$(LIBVISUAL_DIR) \
$(OGG_DIR) \
$(PANGO_DIR) \
......@@ -67,7 +60,6 @@ SUBDIRS = \
DIST_SUBDIRS = \
alsa \
cdparanoia \
gio \
libvisual \
ogg \
pango \
......
......@@ -35,12 +35,6 @@ else
check_alsa =
endif
if USE_GIO
check_gio = pipelines/gio
else
check_gio =
endif
if USE_LIBVISUAL
check_libvisual = elements/libvisual
else
......@@ -102,7 +96,6 @@ endif
check_PROGRAMS = \
$(check_alsa) \
$(check_gio) \
$(check_ogg) \
$(check_vorbis) \
elements/audioconvert \
......@@ -132,6 +125,7 @@ check_PROGRAMS = \
pipelines/streamheader \
pipelines/basetime \
pipelines/capsfilter-renegotiation \
pipelines/gio \
elements/appsink \
elements/appsrc \
elements/audiorate \
......
......@@ -4,11 +4,7 @@ else
FT2_SUBDIRS =
endif
if USE_GIO
GIO_SUBDIRS = gio
endif
SUBDIRS = app audio dynamic fft $(FT2_SUBDIRS) $(GIO_SUBDIRS) overlay playrec encoding
SUBDIRS = app audio dynamic fft $(FT2_SUBDIRS) gio overlay playrec encoding
DIST_SUBDIRS = app audio dynamic fft gio overlay seek snapshot playrec encoding
include $(top_srcdir)/common/parallel-subdirs.mak
......
if HAVE_GTK
if USE_GIO
noinst_PROGRAMS = giosrc-mounting
giosrc_mounting_SOURCES = giosrc-mounting.c
giosrc_mounting_CFLAGS = $(GST_CFLAGS) $(GTK_CFLAGS) $(GIO_CFLAGS)
giosrc_mounting_LDADD = $(GST_LIBS) $(GTK_LIBS) $(GIO_LIBS)
endif
endif
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment