| Patrick Williams | b48b7b4 | 2016-08-17 15:04:38 -0500 | [diff] [blame^] | 1 | From 4ee15a8a69b84526ece1180a288a37db077bcd9b 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 | utils/media-ctl/Makefile.am | 11 +++-------- |
| 15 | 1 file changed, 3 insertions(+), 8 deletions(-) |
| 16 | |
| 17 | diff --git a/utils/media-ctl/Makefile.am b/utils/media-ctl/Makefile.am |
| 18 | index a3931fb..fe1fea5 100644 |
| 19 | --- a/utils/media-ctl/Makefile.am |
| 20 | +++ b/utils/media-ctl/Makefile.am |
| 21 | @@ -1,14 +1,9 @@ |
| 22 | -noinst_LTLIBRARIES = libmediactl.la libv4l2subdev.la |
| 23 | - |
| 24 | +lib_LTLIBRARIES = libmediactl.la libv4l2subdev.la |
| 25 | libmediactl_la_SOURCES = libmediactl.c mediactl-priv.h |
| 26 | -libmediactl_la_CFLAGS = -static $(LIBUDEV_CFLAGS) |
| 27 | -libmediactl_la_LDFLAGS = -static $(LIBUDEV_LIBS) |
| 28 | - |
| 29 | +libmediactl_la_CFLAGS = $(LIBUDEV_CFLAGS) |
| 30 | +libmediactl_la_LDFLAGS = $(LIBUDEV_LIBS) |
| 31 | libv4l2subdev_la_SOURCES = libv4l2subdev.c |
| 32 | libv4l2subdev_la_LIBADD = libmediactl.la |
| 33 | -libv4l2subdev_la_CFLAGS = -static |
| 34 | -libv4l2subdev_la_LDFLAGS = -static |
| 35 | - |
| 36 | mediactl_includedir=$(includedir)/mediactl |
| 37 | noinst_HEADERS = mediactl.h v4l2subdev.h |
| 38 | |
| 39 | -- |
| 40 | 2.1.4 |
| 41 | |