blob: eb294b3fb4feb31abe3088d44027a7b7ddbbcd34 [file] [log] [blame]
Brad Bishop316dfdd2018-06-25 12:45:53 -04001From 67a6e919b8263d6d2b7150e62f26fb06bbc526ef Mon Sep 17 00:00:00 2001
Patrick Williamsb48b7b42016-08-17 15:04:38 -05002From: Khem Raj <raj.khem@gmail.com>
3Date: Fri, 27 Feb 2015 21:55:36 +0000
4Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and
5 libv4l2subdev"
6
7This reverts commit 0911dce53b08b0df3066be2c75f67e8a314d8729.
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11Conflicts:
12 utils/media-ctl/Makefile.am
Brad Bishop316dfdd2018-06-25 12:45:53 -040013
Patrick Williamsb48b7b42016-08-17 15:04:38 -050014---
Brad Bishop6e60e8b2018-02-01 10:27:11 -050015 utils/media-ctl/Makefile.am | 10 +++-------
16 1 file changed, 3 insertions(+), 7 deletions(-)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050017
18diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am
Brad Bishop6e60e8b2018-02-01 10:27:11 -050019index ee7dcc9..d11fa2e 100644
Patrick Williamsb48b7b42016-08-17 15:04:38 -050020--- a/utils/media-ctl/Makefile.am
21+++ b/utils/media-ctl/Makefile.am
Brad Bishop6e60e8b2018-02-01 10:27:11 -050022@@ -1,8 +1,7 @@
Patrick Williamsb48b7b42016-08-17 15:04:38 -050023-noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la
24-
25+lib_LTLIBRARIES = libmediactl.la libv4l2subdev.la
26 libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h
27-libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS)
28-libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050029+libmediactl_la_CFLAGS = $(LIBUDEV_CFLAGS)
30+libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS)
Brad Bishop6e60e8b2018-02-01 10:27:11 -050031
32 media-bus-format-names.h: ../../include/linux/media-bus-format.h
33 sed -e '/#define MEDIA_BUS_FMT/ ! d; s/.*FMT_//; /FIXED/ d; s/\t.*//; s/.*/{ \"&\", MEDIA_BUS_FMT_& },/;' \
34@@ -18,9 +17,6 @@ CLEANFILES = $(BUILT_SOURCES)
35 nodist_libv4l2subdev_la_SOURCES = $(BUILT_SOURCES)
Patrick Williamsb48b7b42016-08-17 15:04:38 -050036 libv4l2subdev_la_SOURCES = libv4l2subdev.c
37 libv4l2subdev_la_LIBADD = libmediactl.la
38-libv4l2subdev_la_CFLAGS = -static
39-libv4l2subdev_la_LDFLAGS = -static
40-
41 mediactl_includedir=$(includedir)/mediactl
42 noinst_HEADERS = mediactl.h v4l2subdev.h
43