aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2020-10-24 12:29:03 +0200
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2020-10-24 12:29:03 +0200
commit7ab86eba54233fa31344501134b1c1ab7f10c535 (patch)
treeac527241eb7095c09fc740d4ee61a6eb5643e09d
parenta8dfbca6c2cd01ccaf36d2095a1d9f18f51caf63 (diff)
v4l2-ctl-32: use v4l2_ctl_CPPFLAGS, fix wrong check
Use v4l2_ctl_CPPFLAGS to build v4l2-ctl-32 to ensure it is consistent with building v4l2-ctl. In this case the GIT_COMMIT_CNT define was missing from v4l2-ctl-32, using v4l2_ctl_CPPFLAGS fixed that. Also v4l2-ctl-32 depended on 'if WITH_V4L2_COMPLIANCE_32' instead of 'if WITH_V4L2_CTL_32'. Fixed this as well. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--utils/v4l2-ctl/Makefile.am6
1 files changed, 3 insertions, 3 deletions
diff --git a/utils/v4l2-ctl/Makefile.am b/utils/v4l2-ctl/Makefile.am
index 04d30894..2a59c968 100644
--- a/utils/v4l2-ctl/Makefile.am
+++ b/utils/v4l2-ctl/Makefile.am
@@ -3,7 +3,7 @@ man_MANS = v4l2-ctl.1
DEFS :=
if HAVE_M32
-if WITH_V4L2_COMPLIANCE_32
+if WITH_V4L2_CTL_32
bin_PROGRAMS += v4l2-ctl-32
endif
endif
@@ -37,8 +37,8 @@ nodist_v4l2_ctl_32_SOURCES = v4l2-ctl-32.c
v4l2-ctl-32$(EXEEXT): $(addprefix $(top_srcdir)/utils/v4l2-ctl/,$(v4l2_ctl_SOURCES)) media-bus-format-names.h
cat $(addprefix $(top_srcdir)/utils/v4l2-ctl/,$(filter %.c,$(v4l2_ctl_SOURCES))) >$@.c
- $(COMPILE) -static -m32 -DNO_LIBV4L2 -c -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/utils/common $@.c
- $(CXXCOMPILE) -static -m32 -DNO_LIBV4L2 -o $@ -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/utils/common $(addprefix $(top_srcdir)/utils/v4l2-ctl/,$(filter %.cpp,$(v4l2_ctl_SOURCES))) $@.o
+ $(COMPILE) -static -m32 -DNO_LIBV4L2 -c -I$(top_srcdir) -I$(top_srcdir)/include $(v4l2_ctl_CPPFLAGS) $@.c
+ $(CXXCOMPILE) -static -m32 -DNO_LIBV4L2 -o $@ -I$(top_srcdir) -I$(top_srcdir)/include $(v4l2_ctl_CPPFLAGS) $(addprefix $(top_srcdir)/utils/v4l2-ctl/,$(filter %.cpp,$(v4l2_ctl_SOURCES))) $@.o
rm -f $@.c $@.o
EXTRA_DIST = Android.mk v4l2-ctl.1

Privacy Policy