diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-13 12:56:07 +0100 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2009-02-13 12:56:07 +0100 |
| commit | d9fcd7e5495fbd0fe020223823338d21ce31dcaf (patch) | |
| tree | b940ae37e5d028fb136c13ed1b2f859f2ec3f5f2 /v4l2-apps/util | |
| parent | 404ee5d5dea9be4f51d5a436a2a33a00e47be1ed (diff) | |
| download | mediapointer-dvb-s2-d9fcd7e5495fbd0fe020223823338d21ce31dcaf.tar.gz mediapointer-dvb-s2-d9fcd7e5495fbd0fe020223823338d21ce31dcaf.tar.bz2 | |
libv4l2util: rename from libv4l2 to prevent clash with the libv4l2 conversion library
From: Hans Verkuil <hverkuil@xs4all.nl>
libv4l2 was introduced to fix conversion problems. But this clashed with
the already existing libv4l2 utility library. Renamed that libv4l2 library
and header to libv4l2util.
Priority: normal
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'v4l2-apps/util')
| -rw-r--r-- | v4l2-apps/util/Makefile | 6 | ||||
| -rw-r--r-- | v4l2-apps/util/qv4l2/ctrl-tab.cpp | 2 | ||||
| -rw-r--r-- | v4l2-apps/util/qv4l2/general-tab.cpp | 2 | ||||
| -rw-r--r-- | v4l2-apps/util/qv4l2/qv4l2.cpp | 2 | ||||
| -rw-r--r-- | v4l2-apps/util/qv4l2/qv4l2.pro | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/v4l2-apps/util/Makefile b/v4l2-apps/util/Makefile index f2c4c0a38..80bffc50d 100644 --- a/v4l2-apps/util/Makefile +++ b/v4l2-apps/util/Makefile @@ -36,11 +36,11 @@ v4l2-dbg.o: v4l2-dbg.h v4l2-dbg-bttv.h v4l2-dbg-em28xx.h v4l2-dbg-saa7134.h v4l2_sysfs_path.o: v4l2_sysfs_path.c ../lib/v4l2_driver.h -v4l2_sysfs_path: v4l2_sysfs_path.o ../lib/libv4l2.a +v4l2_sysfs_path: v4l2_sysfs_path.o ../lib/libv4l2util.a $(CC) $^ -o $@ -lsysfs -../lib/libv4l2.a: - $(MAKE) -C ../lib libv4l2.a +../lib/libv4l2util.a: + $(MAKE) -C ../lib libv4l2util.a install: mkdir -p $(prefix)/bin diff --git a/v4l2-apps/util/qv4l2/ctrl-tab.cpp b/v4l2-apps/util/qv4l2/ctrl-tab.cpp index c7d1a275c..6f436b494 100644 --- a/v4l2-apps/util/qv4l2/ctrl-tab.cpp +++ b/v4l2-apps/util/qv4l2/ctrl-tab.cpp @@ -1,6 +1,6 @@ #include "qv4l2.h" -#include "v4l2.h" +#include "libv4l2util.h" #include <qstatusbar.h> #include <qlineedit.h> diff --git a/v4l2-apps/util/qv4l2/general-tab.cpp b/v4l2-apps/util/qv4l2/general-tab.cpp index 3b9ad2e5b..78656cf10 100644 --- a/v4l2-apps/util/qv4l2/general-tab.cpp +++ b/v4l2-apps/util/qv4l2/general-tab.cpp @@ -20,7 +20,7 @@ #include "qv4l2.h" #include "general-tab.h" -#include "v4l2.h" +#include "libv4l2util.h" #include <qlabel.h> #include <qspinbox.h> diff --git a/v4l2-apps/util/qv4l2/qv4l2.cpp b/v4l2-apps/util/qv4l2/qv4l2.cpp index d144723d9..764fbd172 100644 --- a/v4l2-apps/util/qv4l2/qv4l2.cpp +++ b/v4l2-apps/util/qv4l2/qv4l2.cpp @@ -1,7 +1,7 @@ #include "qv4l2.h" #include "general-tab.h" -#include "v4l2.h" +#include "libv4l2util.h" #include <qimage.h> #include <qpixmap.h> diff --git a/v4l2-apps/util/qv4l2/qv4l2.pro b/v4l2-apps/util/qv4l2/qv4l2.pro index 5e0b7555d..770c2d702 100644 --- a/v4l2-apps/util/qv4l2/qv4l2.pro +++ b/v4l2-apps/util/qv4l2/qv4l2.pro @@ -9,4 +9,4 @@ CONFIG += debug # Input HEADERS += qv4l2.h general-tab.h SOURCES += qv4l2.cpp general-tab.cpp ctrl-tab.cpp -LIBS += -lv4l2 -L../../lib +LIBS += -lv4l2util -L../../lib |