From 4e061e403e8a5ab5f041a54a6852c69e6b00b368 Mon Sep 17 00:00:00 2001
From: Hans Verkuil <hverkuil@xs4all.nl>
Date: Fri, 13 Feb 2009 13:06:29 +0100
Subject: v4l2-apps: move libraries around to make the directory tree flatter

From: Hans Verkuil <hverkuil@xs4all.nl>

Instead of having libv4l2util in v4l2-apps/lib and libv4l in v4l2-apps/lib/libv4l,
both are now moved to v4l2-apps/libv4l2util and v4l2-apps/libv4l.

This is much cleaner and less confusing.

Priority: normal

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
---
 v4l2-apps/util/Makefile          | 8 ++++----
 v4l2-apps/util/qv4l2/qv4l2.pro   | 4 ++--
 v4l2-apps/util/v4l2_sysfs_path.c | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'v4l2-apps/util')

diff --git a/v4l2-apps/util/Makefile b/v4l2-apps/util/Makefile
index 80bffc50d..4bfe22aa1 100644
--- a/v4l2-apps/util/Makefile
+++ b/v4l2-apps/util/Makefile
@@ -34,13 +34,13 @@ v4l2-dbg: v4l2-dbg.o v4l2-chipids.o
 
 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.o: v4l2_sysfs_path.c ../libv4l2util/v4l2_driver.h
 
-v4l2_sysfs_path: v4l2_sysfs_path.o ../lib/libv4l2util.a
+v4l2_sysfs_path: v4l2_sysfs_path.o ../libv4l2util/libv4l2util.a
 	$(CC) $^ -o $@ -lsysfs
 
-../lib/libv4l2util.a:
-	$(MAKE) -C ../lib libv4l2util.a
+../libv4l2util/libv4l2util.a:
+	$(MAKE) -C ../libv4l2util libv4l2util.a
 
 install:
 	mkdir -p $(prefix)/bin
diff --git a/v4l2-apps/util/qv4l2/qv4l2.pro b/v4l2-apps/util/qv4l2/qv4l2.pro
index 770c2d702..96adb7260 100644
--- a/v4l2-apps/util/qv4l2/qv4l2.pro
+++ b/v4l2-apps/util/qv4l2/qv4l2.pro
@@ -3,10 +3,10 @@
 ######################################################################
 
 TEMPLATE = app
-INCLUDEPATH += . ../../include ../../lib
+INCLUDEPATH += . ../../include ../../libv4l2util
 CONFIG += debug
 
 # Input
 HEADERS += qv4l2.h general-tab.h
 SOURCES += qv4l2.cpp general-tab.cpp ctrl-tab.cpp
-LIBS += -lv4l2util -L../../lib
+LIBS += -lv4l2util -L../../libv4l2util
diff --git a/v4l2-apps/util/v4l2_sysfs_path.c b/v4l2-apps/util/v4l2_sysfs_path.c
index 2fe89b6c7..e3f3e63e8 100644
--- a/v4l2-apps/util/v4l2_sysfs_path.c
+++ b/v4l2-apps/util/v4l2_sysfs_path.c
@@ -16,7 +16,7 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#include "../lib/v4l2_driver.h"
+#include "../libv4l2util/v4l2_driver.h"
 #include <sysfs/libsysfs.h>
 #include <errno.h>
 #include <malloc.h>
-- 
cgit v1.2.3