aboutsummaryrefslogtreecommitdiffstats
path: root/Makefile.am
diff options
context:
space:
mode:
authorHans Verkuil <hans.verkuil@cisco.com>2012-09-27 09:14:01 +0200
committerHans Verkuil <hans.verkuil@cisco.com>2012-09-27 09:14:01 +0200
commit5727b36cf71d5b70a403d1ec3f1d5fa29793eb55 (patch)
tree1e0fe88790b93327678e3ea2a5ba374e0dd7859c /Makefile.am
parentc960cf53b84a6b73fedc03e0c2b7aff6d549c167 (diff)
Ran make sync-with-kernel and updated everything.
Fixed a number of incorrect paths after the reorg as well. Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Diffstat (limited to 'Makefile.am')
-rw-r--r--Makefile.am2
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index 8ef0d003..d6aea36c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,6 +43,7 @@ EXTRA_DIST = contrib include README.lib README.lib-multi-threading
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 \
! -f $(KERNEL_DIR)/include/media/v4l2-chip-ident.h ]; then \
@@ -50,6 +51,7 @@ sync-with-kernel:
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/media/v4l2-chip-ident.h $(top_srcdir)/include/media

Privacy Policy