| rjw | 1f88458 | 2022-01-06 17:20:42 +0800 | [diff] [blame^] | 1 | From 67a6e919b8263d6d2b7150e62f26fb06bbc526ef Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Fri, 27 Feb 2015 21:55:36 +0000 |
| 4 | Subject: [PATCH] Revert "media-ctl: Don't install libmediactl and |
| 5 | libv4l2subdev" |
| 6 | |
| 7 | This reverts commit 0911dce53b08b0df3066be2c75f67e8a314d8729. |
| 8 | |
| 9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 10 | |
| 11 | Conflicts: |
| 12 | utils/media-ctl/Makefile.am |
| 13 | |
| 14 | --- |
| 15 | utils/media-ctl/Makefile.am | 10 +++------- |
| 16 | 1 file changed, 3 insertions(+), 7 deletions(-) |
| 17 | |
| 18 | diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am |
| 19 | index ee7dcc9..d11fa2e 100644 |
| 20 | --- a/utils/media-ctl/Makefile.am |
| 21 | +++ b/utils/media-ctl/Makefile.am |
| 22 | @@ -1,8 +1,7 @@ |
| 23 | -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) |
| 29 | +libmediactl_la_CFLAGS = $(LIBUDEV_CFLAGS) |
| 30 | +libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS) |
| 31 | |
| 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) |
| 36 | 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 | |