9 files changed, 16 insertions, 16 deletions
diff --git a/v4l2-apps/lib/Makefile b/v4l2-apps/lib/Makefile
index 8443039b4..f3f413071 100644
--- a/v4l2-apps/lib/Makefile
+++ b/v4l2-apps/lib/Makefile
@@ -2,12 +2,12 @@
 
 CPPFLAGS += -I../include -I..
 
-includes = v4l2.h
+includes = libv4l2util.h
 
 objects  = frequencies.o v4l2_driver.o
 
-sharedlib = libv4l2.so
-staticlib = libv4l2.a
+sharedlib = libv4l2util.so
+staticlib = libv4l2util.a
 
 ifeq ($(prefix),)
 prefix = /usr
diff --git a/v4l2-apps/lib/frequencies.c b/v4l2-apps/lib/frequencies.c
index 64379d2b0..df8d47dba 100644
--- a/v4l2-apps/lib/frequencies.c
+++ b/v4l2-apps/lib/frequencies.c
@@ -22,7 +22,7 @@
 #include <stdlib.h>
 
 #include <linux/videodev2.h>
-#include "v4l2.h"
+#include "libv4l2util.h"
 
 /* This source was originally written by Nathan Laredo <laredo@gnu.org>.
    He kindly gave permission to release this source under the LGPL
diff --git a/v4l2-apps/lib/v4l2.h b/v4l2-apps/lib/libv4l2util.h
index 172688853..fde7cdc75 100644
--- a/v4l2-apps/lib/v4l2.h
+++ b/v4l2-apps/lib/libv4l2util.h
@@ -15,8 +15,8 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#ifndef _V4L2_H_
-#define _V4L2_H_
+#ifndef _V4L2UTIL_H_
+#define _V4L2UTIL_H_
 
 /* --------------------------------------------------------------------- */
 
diff --git a/v4l2-apps/test/Makefile b/v4l2-apps/test/Makefile
index a996c0baf..e3879bc5e 100644
--- a/v4l2-apps/test/Makefile
+++ b/v4l2-apps/test/Makefile
@@ -21,10 +21,10 @@ clean::
 
 install:
 
-../lib/libv4l2.a: ../lib/v4l2_driver.c ../lib/frequencies.c
-	make -C ../lib libv4l2.a
+../lib/libv4l2util.a: ../lib/v4l2_driver.c ../lib/frequencies.c
+	make -C ../lib libv4l2util.a
 
-driver-test: driver-test.o ../lib/libv4l2.a
+driver-test: driver-test.o ../lib/libv4l2util.a
 
 pixfmt-test: pixfmt-test.o
 	$(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ -lX11
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