summaryrefslogtreecommitdiff
path: root/v4l2-apps/util
diff options
context:
space:
mode:
Diffstat (limited to 'v4l2-apps/util')
-rw-r--r--v4l2-apps/util/Makefile6
-rw-r--r--v4l2-apps/util/qv4l2/ctrl-tab.cpp2
-rw-r--r--v4l2-apps/util/qv4l2/general-tab.cpp2
-rw-r--r--v4l2-apps/util/qv4l2/qv4l2.cpp2
-rw-r--r--v4l2-apps/util/qv4l2/qv4l2.pro2
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