aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-12-05 10:41:47 +0100
committerHans Verkuil <hans.verkuil@cisco.com>2012-12-05 10:41:47 +0100
commitfe2aa5f767eba7276978a82cf62349a3cd1ff937 (patch)
tree4de47d4ce66b3422252c39ac05b57c8cd7a29528 /Makefile.am
parentb9be2f1c377e46ef9ddc28cb270f1e2f30a6d5c7 (diff)
v4l-utils: sync with latest kernel headers.
I had to make quite a few changes due to the introduction of the uapi directory, lots of paths had to be changed. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am16
1 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.am b/Makefile.am
index 32582f1f..491c83d3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,18 +12,18 @@ EXTRA_DIST = include README.lib README.lib-multi-threading
# custom targets
sync-with-kernel:
- @if [ ! -f $(KERNEL_DIR)/include/linux/videodev2.h -o \
- ! -f $(KERNEL_DIR)/include/linux/v4l2-controls.h -o \
- ! -f $(KERNEL_DIR)/include/linux/v4l2-common.h -o \
- ! -f $(KERNEL_DIR)/include/linux/ivtv.h -o \
+ @if [ ! -f $(KERNEL_DIR)/include/uapi/linux/videodev2.h -o \
+ ! -f $(KERNEL_DIR)/include/uapi/linux/v4l2-controls.h -o \
+ ! -f $(KERNEL_DIR)/include/uapi/linux/v4l2-common.h -o \
+ ! -f $(KERNEL_DIR)/include/uapi/linux/ivtv.h -o \
! -f $(KERNEL_DIR)/include/media/v4l2-chip-ident.h ]; then \
echo "Error you must set KERNEL_DIR to point to an extracted kernel source dir"; \
exit 1; \
fi
- cp -a $(KERNEL_DIR)/include/linux/videodev2.h $(top_srcdir)/include/linux
- cp -a $(KERNEL_DIR)/include/linux/v4l2-controls.h $(top_srcdir)/include/linux
- cp -a $(KERNEL_DIR)/include/linux/v4l2-common.h $(top_srcdir)/include/linux
- cp -a $(KERNEL_DIR)/include/linux/ivtv.h $(top_srcdir)/include/linux
+ cp -a $(KERNEL_DIR)/include/uapi/linux/videodev2.h $(top_srcdir)/include/linux
+ cp -a $(KERNEL_DIR)/include/uapi/linux/v4l2-controls.h $(top_srcdir)/include/linux
+ cp -a $(KERNEL_DIR)/include/uapi/linux/v4l2-common.h $(top_srcdir)/include/linux
+ cp -a $(KERNEL_DIR)/include/uapi/linux/ivtv.h $(top_srcdir)/include/linux
cp -a $(KERNEL_DIR)/include/media/v4l2-chip-ident.h $(top_srcdir)/include/media
$(MAKE) -C utils/keytable $@

Privacy Policy