Fix broken v4lutil Makefiles

Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>

diff --git a/Make.rules b/Make.rules
index 9f427901cfa89582813b1de08f4bc687328afd24..f5ed85a03bf7906574a3373bbeef849c7953575a 100644 (file)
--- 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 2d91095b0215af3bc29e600cbe73fd129567ce98..5f67c0205ecd4c2edf728829edf045e49783bc50 100644 (file)
--- 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 fa3aab2b0c916a4ac2d5350d076d1896b82ab454..c5ca32a70d26f6c79324d69344c48ef62a60b28b 100644 (file)
--- 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