Move -ldl -ljpeg to the files that actually need it

This avoids creating extra dependencies on other files.

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/Make.rules b/Make.rules
index 759c75b..6fa132e 100644 (file)
--- a/Make.rules
+++ b/Make.rules
@@ -15,7 +15,7 @@ MANDIR = $(PREFIX)/share/man
 
 # Note the -I../.. this assumes all sources live in a 2 level dir hierarchy!
 override CPPFLAGS += -I../../include -I../../lib/include -D_GNU_SOURCE -DV4L_UTILS_VERSION='"$(V4L_UTILS_VERSION)"'
-override LDFLAGS += -L../../lib/libv4l1 -L../../lib/libv4l2 -L../../lib/libv4lconvert -ldl -ljpeg
+override LDFLAGS += -L../../lib/libv4l1 -L../../lib/libv4l2 -L../../lib/libv4lconvert
 
 # And last various rules
 

diff --git a/utils/v4l2-compliance/Makefile b/utils/v4l2-compliance/Makefile
index b65fc82..7ba874a 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 v4l2-test-formats.o
-       $(CXX) $(LDFLAGS) -o $@ $^ -lv4l2 -lv4lconvert -lrt
+       $(CXX) $(LDFLAGS) -o $@ $^ -ldl -ljpeg -lv4l2 -lv4lconvert -lrt
 
 install: $(TARGETS)
        mkdir -p $(DESTDIR)$(PREFIX)/bin

diff --git a/utils/v4l2-ctl/Makefile b/utils/v4l2-ctl/Makefile
index 5ea58c7..4a2e0ae 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) -o $@ $^ -lv4l2 -lv4lconvert -lrt
+       $(CXX) $(LDFLAGS) -o $@ $^ -ldl -ljpeg -lv4l2 -lv4lconvert -lrt
 
 install: $(TARGETS)
        mkdir -p $(DESTDIR)$(PREFIX)/bin