This is an automatic generated email to let you know that the following patch
were queued at the
http://git.linuxtv.org/v4l-utils.git tree:
Subject: Revert "v4l2-ctl/compliance: use local libv4l2 rather than the
installed version."
Author: Hans Verkuil <hverk...@xs4all.nl>
Date: Mon Jan 17 14:14:49 2011 +0100
This reverts commit 34b49ec47fc1e517485b221366a7d2a207306304.
Conflicts:
utils/v4l2-compliance/Makefile
This patch didn't work if you didn't have libv4l installed.
For now just revert this until we have a better solution.
Signed-off-by: Hans Verkuil <hverk...@xs4all.nl>
utils/v4l2-compliance/Makefile | 2 +-
utils/v4l2-ctl/Makefile | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
---
http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=ef4ee92c72a6917be53b9a570eeab4d4c0900b49
diff --git a/utils/v4l2-compliance/Makefile b/utils/v4l2-compliance/Makefile
index c6798f1..2d91095 100644
--- a/utils/v4l2-compliance/Makefile
+++ b/utils/v4l2-compliance/Makefile
@@ -6,7 +6,7 @@ all: $(TARGETS)
v4l2-compliance: v4l2-compliance.o v4l2-test-debug.o v4l2-test-input-output.o \
v4l2-test-controls.o v4l2-test-io-config.o
- $(CXX) -I../../lib/include -I../../include $(LDFLAGS)
-L../../lib/libv4l2 -lv4l2 -o $@ $^
+ $(CXX) $(LDFLAGS) -lv4l2 -o $@ $^
install: $(TARGETS)
mkdir -p $(DESTDIR)$(PREFIX)/bin
diff --git a/utils/v4l2-ctl/Makefile b/utils/v4l2-ctl/Makefile
index 3a055c8..fa3aab2 100644
--- a/utils/v4l2-ctl/Makefile
+++ b/utils/v4l2-ctl/Makefile
@@ -13,7 +13,7 @@ ivtv-ctl: ivtv-ctl.o
$(CC) $(LDFLAGS) -o $@ $^ -lm
v4l2-ctl: v4l2-ctl.o
- $(CXX) -I../../lib/include -I../../include $(LDFLAGS)
-L../../lib/libv4l2 -lv4l2 -o $@ $^
+ $(CXX) $(LDFLAGS) -lv4l2 -o $@ $^
install: $(TARGETS)
mkdir -p $(DESTDIR)$(PREFIX)/bin
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
