aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil-cisco@xs4all.nl>2020-03-10 12:20:10 +0100
committerHans Verkuil <hverkuil-cisco@xs4all.nl>2020-03-10 12:20:10 +0100
commit4b60e08368489011589c4cef8ee77772ddef35bd (patch)
treee4bce7139705a2fef4faad66361569f092a248ff
parenteecd6100da64dbe4096a032d680464d9b60c783c (diff)
v4l2-ctl/compliance-32: fix when configuring from another dir
Allow building in a build directory by setting the right dependencies and paths. Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
-rw-r--r--utils/v4l2-compliance/Makefile.am4
-rw-r--r--utils/v4l2-ctl/Makefile.am8
2 files changed, 6 insertions, 6 deletions
diff --git a/utils/v4l2-compliance/Makefile.am b/utils/v4l2-compliance/Makefile.am
index 5c0da68d..f67204c2 100644
--- a/utils/v4l2-compliance/Makefile.am
+++ b/utils/v4l2-compliance/Makefile.am
@@ -34,8 +34,8 @@ version.h:
touch $@ ; \
fi
-v4l2-compliance-32$(EXEEXT):
- g++ -o $@ -static -m32 -DNO_LIBV4L2 -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/utils/common $(top_srcdir)/utils/v4l2-compliance/*.cpp
+v4l2-compliance-32$(EXEEXT): $(addprefix $(top_srcdir)/utils/v4l2-compliance/,$(v4l2_compliance_SOURCES))
+ $(CXXCOMPILE) -o $@ -static -m32 -DNO_LIBV4L2 -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/utils/common $(addprefix $(top_srcdir)/utils/v4l2-ctl/,$(filter %.cpp,$(v4l2_compliance_SOURCES)))
clean-local:
-rm -vf version.h
diff --git a/utils/v4l2-ctl/Makefile.am b/utils/v4l2-ctl/Makefile.am
index d7066795..297d84ab 100644
--- a/utils/v4l2-ctl/Makefile.am
+++ b/utils/v4l2-ctl/Makefile.am
@@ -33,10 +33,10 @@ if !WITH_V4L2_CTL_STREAM_TO
DEFS += -DNO_STREAM_TO
endif
-v4l2-ctl-32$(EXEEXT): media-bus-format-names.h
- cat $(top_srcdir)/utils/v4l2-ctl/$(filter %.c,$(v4l2_ctl_SOURCES)) >$@.c
- gcc -static -m32 -DNO_LIBV4L2 -c -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/utils/common $@.c
- g++ -static -m32 -DNO_LIBV4L2 -o $@ -I$(top_srcdir) -I$(top_srcdir)/include -I$(top_srcdir)/utils/common $(top_srcdir)/utils/v4l2-ctl/$(filter %.cpp,$(v4l2_ctl_SOURCES)) $@.o
+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
rm -f $@.c $@.o
EXTRA_DIST = Android.mk v4l2-ctl.1

Privacy Policy