diff options
| author | hans@rhel5-devel.localdomain <hans@rhel5-devel.localdomain> | 2009-04-16 10:49:08 +0200 |
|---|---|---|
| committer | hans@rhel5-devel.localdomain <hans@rhel5-devel.localdomain> | 2009-04-16 10:49:08 +0200 |
| commit | 419bda948df875f0c02e25d005d8d20b58fc0931 (patch) | |
| tree | 72e1142cf849464f9428f36b40509006c20ecae7 | |
| parent | 279a5b30fa2545d54a582d9a8e4dd3e4beceac40 (diff) | |
| download | mediapointer-dvb-s2-419bda948df875f0c02e25d005d8d20b58fc0931.tar.gz mediapointer-dvb-s2-419bda948df875f0c02e25d005d8d20b58fc0931.tar.bz2 | |
libv4l: link libv4lcontrol against rt, not libv4l2
From: Hans de Goede <hdegoede@redhat.com>
libv4l: link libv4lcontrol against rt, not libv4l2
Priority: normal
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| -rw-r--r-- | v4l2-apps/libv4l/ChangeLog | 4 | ||||
| -rw-r--r-- | v4l2-apps/libv4l/libv4l2/Makefile | 3 | ||||
| -rw-r--r-- | v4l2-apps/libv4l/libv4lconvert/Makefile | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/v4l2-apps/libv4l/ChangeLog b/v4l2-apps/libv4l/ChangeLog index e60ccdbb2..6081e26cf 100644 --- a/v4l2-apps/libv4l/ChangeLog +++ b/v4l2-apps/libv4l/ChangeLog @@ -1,3 +1,7 @@ +libv4l-0.5.98 +------------- +* Genius E-M 112 needs both upside down and whitebalance flags + libv4l-0.5.97 ------------- * As the version number shows this is a beta release of the 0.6.x series, diff --git a/v4l2-apps/libv4l/libv4l2/Makefile b/v4l2-apps/libv4l/libv4l2/Makefile index 4356c0975..463e4e833 100644 --- a/v4l2-apps/libv4l/libv4l2/Makefile +++ b/v4l2-apps/libv4l/libv4l2/Makefile @@ -3,7 +3,7 @@ override CPPFLAGS += -I../include -I../../../include -fvisibility=hidden CFLAGS := -g -O1 CFLAGS += -Wall -Wno-unused -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -LIBS_libv4l2 = -lpthread -lrt +LIBS_libv4l2 = -lpthread V4L2_OBJS = libv4l2.o log.o V4L2CONVERT = v4l2convert.so @@ -86,4 +86,3 @@ clean:: %.a: $(AR) cqs $@ $^ - diff --git a/v4l2-apps/libv4l/libv4lconvert/Makefile b/v4l2-apps/libv4l/libv4lconvert/Makefile index 64f6690d2..0e1d5e84e 100644 --- a/v4l2-apps/libv4l/libv4lconvert/Makefile +++ b/v4l2-apps/libv4l/libv4lconvert/Makefile @@ -3,6 +3,8 @@ override CPPFLAGS += -I../include -I../../../include -fvisibility=hidden CFLAGS := -g -O1 CFLAGS += -Wall -Wno-unused -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes +LIBS_libv4lconvert = -lrt + ifeq ($(LINKTYPE),static) CONVERT_LIB = libv4lconvert.a else @@ -73,7 +75,7 @@ clean:: $(CC) -c $(CPPFLAGS) $(CFLAGS) -o $@ $< %.so: - $(CC) -shared $(LDFLAGS) -Wl,-soname,$@.$(LIB_RELEASE) -o $@.$(LIB_RELEASE) $^ + $(CC) -shared $(LDFLAGS) -Wl,-soname,$@.$(LIB_RELEASE) -o $@.$(LIB_RELEASE) $^ $(LIBS_$*) ln -f -s $@.$(LIB_RELEASE) $@ %.a: |