From 7714f654fc83d1020e14c5898c747fe8d1a5ab77 Mon Sep 17 00:00:00 2001 From: Gregor Jasny Date: Wed, 19 Jan 2011 15:34:17 +0100 Subject: [PATCH] Fix broken v4lutil Makefiles Signed-off-by: Gregor Jasny Signed-off-by: Hans de Goede --- Make.rules | 3 ++- utils/v4l2-compliance/Makefile | 2 +- utils/v4l2-ctl/Makefile | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Make.rules b/Make.rules index 9f427901..f5ed85a0 100644 --- a/Make.rules +++ b/Make.rules @@ -15,7 +15,8 @@ LIBSUBDIR = libv4l # These ones should not be overriden from the cmdline # Note the -I../.. this assumes all sources live in a 2 level dir hierarchy! -override CPPFLAGS += -I../../include -D_GNU_SOURCE +override CPPFLAGS += -I../../include -I../../lib/include -D_GNU_SOURCE +override LDFLAGS += -L../../lib/libv4l1 -L../../lib/libv4l2 -L../../lib/libv4lconvert # This is the soname version LIB_RELEASE = 0 diff --git a/utils/v4l2-compliance/Makefile b/utils/v4l2-compliance/Makefile index 2d91095b..5f67c020 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) $(LDFLAGS) -lv4l2 -o $@ $^ + $(CXX) $(LDFLAGS) -lv4l2 -lv4lconvert -o $@ $^ install: $(TARGETS) mkdir -p $(DESTDIR)$(PREFIX)/bin diff --git a/utils/v4l2-ctl/Makefile b/utils/v4l2-ctl/Makefile index fa3aab2b..c5ca32a7 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) $(LDFLAGS) -lv4l2 -o $@ $^ + $(CXX) $(LDFLAGS) -lv4l2 -lv4lconvert -o $@ $^ install: $(TARGETS) mkdir -p $(DESTDIR)$(PREFIX)/bin -- 2.34.1