diff options
| author | hans@rhel5-devel.localdomain <hans@rhel5-devel.localdomain> | 2009-03-11 13:06:48 +0100 |
|---|---|---|
| committer | hans@rhel5-devel.localdomain <hans@rhel5-devel.localdomain> | 2009-03-11 13:06:48 +0100 |
| commit | e6a853deb196982b1b857f651195a41695c324dd (patch) | |
| tree | 0043c16397cf8febf6706d197a0b4d32bd99bb59 | |
| parent | 222cbd6fd0bec2c2e4566a251729f1329e031a22 (diff) | |
| download | mediapointer-dvb-s2-e6a853deb196982b1b857f651195a41695c324dd.tar.gz mediapointer-dvb-s2-e6a853deb196982b1b857f651195a41695c324dd.tar.bz2 | |
libv4l: Do not link the wrapper libs against libphread
From: Gregor Jasny <jasny@vidsoft.de>
libv4l: Do not link the wrapper libs against libphread
Priority: normal
Signed-off-by: Gregor Jasny <jasny@vidsoft.de>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
| -rw-r--r-- | v4l2-apps/libv4l/ChangeLog | 3 | ||||
| -rw-r--r-- | v4l2-apps/libv4l/libv4l1/Makefile | 4 | ||||
| -rw-r--r-- | v4l2-apps/libv4l/libv4l2/Makefile | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/v4l2-apps/libv4l/ChangeLog b/v4l2-apps/libv4l/ChangeLog index 294bb9ad2..f64525126 100644 --- a/v4l2-apps/libv4l/ChangeLog +++ b/v4l2-apps/libv4l/ChangeLog @@ -7,9 +7,10 @@ libv4l-0.5.1 supported cams, except for the pac7302 which only does 640x480 (and skype wants 320x240), work with skype * The v4lconvert_convert function was becoming a bit of a mess, so split the - functionailiy into seperate v4lconvert_convert_pixfmt, v4lconvert_rotate and + functionailiy into separate v4lconvert_convert_pixfmt, v4lconvert_rotate and v4lconvert_crop functions, and make v4lconvert_convert a frontend to these +* Do not link the wrapper libs against libpthread (patch from Gregor Jasny) libv4l-0.5.0 ------------ diff --git a/v4l2-apps/libv4l/libv4l1/Makefile b/v4l2-apps/libv4l/libv4l1/Makefile index 27848477e..7687a0a7c 100644 --- a/v4l2-apps/libv4l/libv4l1/Makefile +++ b/v4l2-apps/libv4l/libv4l1/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 = -lpthread +LIBS_libv4l1 = -lpthread V4L1_OBJS = libv4l1.o log.o V4L1COMPAT = v4l1compat.so @@ -75,7 +75,7 @@ clean:: $(CC) -c -MMD $(CPPFLAGS) $(CFLAGS) -o $@ $< %.so: - $(CC) -shared $(LDFLAGS) -Wl,-soname,$@.$(LIB_RELEASE) -o $@.$(LIB_RELEASE) $^ $(LIBS) + $(CC) -shared $(LDFLAGS) -Wl,-soname,$@.$(LIB_RELEASE) -o $@.$(LIB_RELEASE) $^ $(LIBS_$*) ln -f -s $@.$(LIB_RELEASE) $@ %.a: diff --git a/v4l2-apps/libv4l/libv4l2/Makefile b/v4l2-apps/libv4l/libv4l2/Makefile index 648d27c0c..8e6d2c31e 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 = -lpthread +LIBS_libv4l2 = -lpthread V4L2_OBJS = libv4l2.o log.o V4L2CONVERT = v4l2convert.so @@ -74,7 +74,7 @@ clean:: $(CC) -c -MMD $(CPPFLAGS) $(CFLAGS) -o $@ $< %.so: - $(CC) -shared $(LDFLAGS) -Wl,-soname,$@.$(LIB_RELEASE) -o $@.$(LIB_RELEASE) $^ $(LIBS) + $(CC) -shared $(LDFLAGS) -Wl,-soname,$@.$(LIB_RELEASE) -o $@.$(LIB_RELEASE) $^ $(LIBS_$*) ln -f -s $@.$(LIB_RELEASE) $@ %.a: |