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