Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame^] | 1 | From 806822f5acb756d5acda0f9063c84b28b38b3ffb Mon Sep 17 00:00:00 2001 |
| 2 | From: Ismo Puustinen <ismo.puustinen@intel.com> |
| 3 | Date: Mon, 3 Apr 2017 13:23:38 +0300 |
| 4 | Subject: [PATCH v4l-utils] buildsystem: do not assume building in source tree. |
| 5 | |
| 6 | Use $(top_srcdir) as reference for include paths and buildtime scripts. |
| 7 | Otherwise compilation outside of project root directory will fail |
| 8 | because header and script paths are wrong. |
| 9 | |
| 10 | To reproduce: mkdir b; cd b; ../configure; make |
| 11 | |
| 12 | Upstream-status: Accepted [https://git.linuxtv.org//v4l-utils.git/commit/?id=bd98c9a99bffc8d44c54859345e4dfee0ada4275] |
| 13 | |
| 14 | Signed-off-by: Ismo Puustinen <ismo.puustinen@intel.com> |
| 15 | --- |
| 16 | utils/cec-compliance/Makefile.am | 2 +- |
| 17 | utils/cec-ctl/Makefile.am | 2 +- |
| 18 | utils/cec-follower/Makefile.am | 4 ++-- |
| 19 | utils/qv4l2/Makefile.am | 2 +- |
| 20 | utils/v4l2-compliance/Makefile.am | 2 +- |
| 21 | utils/v4l2-ctl/Makefile.am | 2 +- |
| 22 | 6 files changed, 7 insertions(+), 7 deletions(-) |
| 23 | |
| 24 | diff --git a/utils/cec-compliance/Makefile.am b/utils/cec-compliance/Makefile.am |
| 25 | index ec5de51..8331aa0 100644 |
| 26 | --- a/utils/cec-compliance/Makefile.am |
| 27 | +++ b/utils/cec-compliance/Makefile.am |
| 28 | @@ -7,7 +7,7 @@ cec_compliance_LDFLAGS = -lrt |
| 29 | cec-compliance.cpp: cec-table.h |
| 30 | |
| 31 | cec-table.h: ../cec-ctl/msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h |
| 32 | - ../cec-ctl/msg2ctl.pl 2 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@ |
| 33 | + $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 2 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ |
| 34 | |
| 35 | cec-compliance.cpp: version.h |
| 36 | |
| 37 | diff --git a/utils/cec-ctl/Makefile.am b/utils/cec-ctl/Makefile.am |
| 38 | index 0a7ef22..6afb6c9 100644 |
| 39 | --- a/utils/cec-ctl/Makefile.am |
| 40 | +++ b/utils/cec-ctl/Makefile.am |
| 41 | @@ -7,7 +7,7 @@ cec_ctl_LDFLAGS = -lrt |
| 42 | cec-ctl.cpp: cec-ctl-gen.h |
| 43 | |
| 44 | cec-ctl-gen.h: msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h |
| 45 | - ./msg2ctl.pl 0 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@ |
| 46 | + $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 0 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ |
| 47 | |
| 48 | clean-local: |
| 49 | -rm -vf cec-ctl-gen.h |
| 50 | diff --git a/utils/cec-follower/Makefile.am b/utils/cec-follower/Makefile.am |
| 51 | index 538edb2..fdbf3d9 100644 |
| 52 | --- a/utils/cec-follower/Makefile.am |
| 53 | +++ b/utils/cec-follower/Makefile.am |
| 54 | @@ -7,12 +7,12 @@ cec_follower_LDFLAGS = -lrt |
| 55 | cec-log.cpp: cec-log.h |
| 56 | |
| 57 | cec-log.h: ../cec-ctl/msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h |
| 58 | - ../cec-ctl/msg2ctl.pl 1 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@ |
| 59 | + $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 1 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ |
| 60 | |
| 61 | cec-follower.cpp: cec-table.h version.h |
| 62 | |
| 63 | cec-table.h: ../cec-ctl/msg2ctl.pl ../../include/linux/cec.h ../../include/linux/cec-funcs.h |
| 64 | - ../cec-ctl/msg2ctl.pl 2 ../../include/linux/cec.h ../../include/linux/cec-funcs.h >$@ |
| 65 | + $(top_srcdir)/utils/cec-ctl/msg2ctl.pl 2 $(top_srcdir)/include/linux/cec.h $(top_srcdir)/include/linux/cec-funcs.h >$@ |
| 66 | |
| 67 | version.h: |
| 68 | @if git rev-parse HEAD >/dev/null 2>&1; then \ |
| 69 | diff --git a/utils/qv4l2/Makefile.am b/utils/qv4l2/Makefile.am |
| 70 | index fd58486..ccd1a2a 100644 |
| 71 | --- a/utils/qv4l2/Makefile.am |
| 72 | +++ b/utils/qv4l2/Makefile.am |
| 73 | @@ -8,7 +8,7 @@ qv4l2_SOURCES = qv4l2.cpp general-tab.cpp ctrl-tab.cpp vbi-tab.cpp capture-win.c |
| 74 | nodist_qv4l2_SOURCES = moc_qv4l2.cpp moc_general-tab.cpp moc_capture-win.cpp moc_vbi-tab.cpp qrc_qv4l2.cpp |
| 75 | qv4l2_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la \ |
| 76 | ../libv4l2util/libv4l2util.la ../libmedia_dev/libmedia_dev.la |
| 77 | -qv4l2_CPPFLAGS = -I../common |
| 78 | +qv4l2_CPPFLAGS = -I$(top_srcdir)/utils/common |
| 79 | |
| 80 | if WITH_QTGL |
| 81 | qv4l2_CPPFLAGS += $(QTGL_CFLAGS) |
| 82 | diff --git a/utils/v4l2-compliance/Makefile.am b/utils/v4l2-compliance/Makefile.am |
| 83 | index 03db8df..18b9892 100644 |
| 84 | --- a/utils/v4l2-compliance/Makefile.am |
| 85 | +++ b/utils/v4l2-compliance/Makefile.am |
| 86 | @@ -5,7 +5,7 @@ DEFS := |
| 87 | v4l2_compliance_SOURCES = v4l2-compliance.cpp v4l2-test-debug.cpp v4l2-test-input-output.cpp \ |
| 88 | v4l2-test-controls.cpp v4l2-test-io-config.cpp v4l2-test-formats.cpp v4l2-test-buffers.cpp \ |
| 89 | v4l2-test-codecs.cpp v4l2-test-colors.cpp v4l2-compliance.h |
| 90 | -v4l2_compliance_CPPFLAGS = -I../common |
| 91 | +v4l2_compliance_CPPFLAGS = -I$(top_srcdir)/utils/common |
| 92 | |
| 93 | if WITH_V4L2_COMPLIANCE_LIBV4L |
| 94 | v4l2_compliance_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la -lrt -lpthread |
| 95 | diff --git a/utils/v4l2-ctl/Makefile.am b/utils/v4l2-ctl/Makefile.am |
| 96 | index 955647d..825e53f 100644 |
| 97 | --- a/utils/v4l2-ctl/Makefile.am |
| 98 | +++ b/utils/v4l2-ctl/Makefile.am |
| 99 | @@ -7,7 +7,7 @@ v4l2_ctl_SOURCES = v4l2-ctl.cpp v4l2-ctl.h v4l2-ctl-common.cpp v4l2-ctl-tuner.cp |
| 100 | v4l2-ctl-overlay.cpp v4l2-ctl-vbi.cpp v4l2-ctl-selection.cpp v4l2-ctl-misc.cpp \ |
| 101 | v4l2-ctl-streaming.cpp v4l2-ctl-sdr.cpp v4l2-ctl-edid.cpp v4l2-ctl-modes.cpp \ |
| 102 | v4l2-tpg-colors.c v4l2-tpg-core.c v4l-stream.c |
| 103 | -v4l2_ctl_CPPFLAGS = -I../common |
| 104 | +v4l2_ctl_CPPFLAGS = -I$(top_srcdir)/utils/common |
| 105 | |
| 106 | if WITH_V4L2_CTL_LIBV4L |
| 107 | v4l2_ctl_LDADD = ../../lib/libv4l2/libv4l2.la ../../lib/libv4lconvert/libv4lconvert.la -lrt -lpthread |
| 108 | -- |
| 109 | 2.9.3 |
| 110 | |