summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2003-10-14 10:13:05 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2003-10-14 10:13:05 +0000
commit7363b9390e23ff35ccf1b08b38b546bb36d56914 (patch)
tree66eed1c1db3ef65ad0f118968513ab702e9e22f4
parent0775f2156e0929e1b9eef759d6f48b2f8ef16065 (diff)
downloadgst-plugins-bad-7363b9390e23ff35ccf1b08b38b546bb36d56914.tar.gz
gst-plugins-bad-7363b9390e23ff35ccf1b08b38b546bb36d56914.tar.bz2
gst-plugins-bad-7363b9390e23ff35ccf1b08b38b546bb36d56914.zip
Forgot to commit Makefile.am - these remove the marshallers and add interface implementation files
Original commit message from CVS: Forgot to commit Makefile.am - these remove the marshallers and add interface implementation files
-rw-r--r--sys/v4l2/Makefile.am43
-rw-r--r--sys/v4l2/gstv4l2element-marshal.list1
2 files changed, 10 insertions, 34 deletions
diff --git a/sys/v4l2/Makefile.am b/sys/v4l2/Makefile.am
index 5995d84f..2e6861ee 100644
--- a/sys/v4l2/Makefile.am
+++ b/sys/v4l2/Makefile.am
@@ -1,45 +1,22 @@
-
plugin_LTLIBRARIES = \
libgstvideo4linux2.la
libgstvideo4linux2_la_SOURCES = \
gstv4l2element.c v4l2_calls.c \
v4l2-overlay_calls.c \
- gstv4l2element-marshal.c \
gstv4l2src.c v4l2src_calls.c \
- gstv4l2.c
+ gstv4l2.c \
+ gstv4l2tuner.c \
+ gstv4l2xoverlay.c \
+ gstv4l2colorbalance.c
libgstvideo4linux2_la_CFLAGS = $(GST_CFLAGS)
-libgstvideo4linux2_la_LIBADD =
+libgstvideo4linux2_la_LIBADD = \
+ $(top_srcdir)/gst-libs/gst/xoverlay/libgstxoverlay.la \
+ $(top_srcdir)/gst-libs/gst/colorbalance/libgstcolorbalance.la \
+ $(top_srcdir)/gst-libs/gst/tuner/libgsttuner.la
libgstvideo4linux2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = gstv4l2element.h v4l2_calls.h \
gstv4l2src.h v4l2src_calls.h \
- gstv4l2element-marshal.h
-
-EXTRA_libgstvideo4linux2_la_SOURCES = \
- gstv4l2element-marshal.list
-
-BUILT_SOURCES = \
- gstv4l2element-marshal.c \
- gstv4l2element-marshal.h
-
-gstv4l2element-marshal.h: gstv4l2element-marshal.list
- glib-genmarshal --header --prefix=gstv4l2_cclosure_marshal $(srcdir)/gstv4l2element-marshal.list > gstv4l2element-marshal.h.tmp
- mv gstv4l2element-marshal.h.tmp gstv4l2element-marshal.h
-
-gstv4l2element-marshal.c: gstv4l2element-marshal.list
- echo "#include \"glib.h\"" > gstv4l2element-marshal.c.tmp
- echo "#include \"glib-object.h\"" >> gstv4l2element-marshal.c.tmp
- echo "#include \"gstv4l2element-marshal.h\"" >> gstv4l2element-marshal.c.tmp
- glib-genmarshal --body --prefix=gstv4l2_cclosure_marshal $(srcdir)/gstv4l2element-marshal.list >> gstv4l2element-marshal.c.tmp
- mv gstv4l2element-marshal.c.tmp gstv4l2element-marshal.c
-
-# Don't want the generated marshal files in the dist
-dist-hook:
- rm -f $(distdir)/gstv4l2element-marshal.c
- rm -f $(distdir)/gstv4l2element-marshal.h
-
-# Clean generated files
-distclean-local:
- rm -f $(top_builddir)/src/element/gstv4l2element-marshal.c
- rm -f $(top_builddir)/src/element/gstv4l2element-marshal.h
+ gstv4l2tuner.h gstv4l2xoverlay.h \
+ gstv4l2colorbalance.h
diff --git a/sys/v4l2/gstv4l2element-marshal.list b/sys/v4l2/gstv4l2element-marshal.list
deleted file mode 100644
index 1f953ddf..00000000
--- a/sys/v4l2/gstv4l2element-marshal.list
+++ /dev/null
@@ -1 +0,0 @@
-VOID:INT,INT