From 72091cc67a980e47b58cc61e9d9fc283214f63d7 Mon Sep 17 00:00:00 2001 From: Mauro Carvalho Chehab Date: Mon, 9 Feb 2009 15:38:11 -0200 Subject: Fix Makefile to compile stress-buffer.c From: Mauro Carvalho Chehab Signed-off-by: Mauro Carvalho Chehab --- v4l2-apps/test/Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'v4l2-apps/test/Makefile') diff --git a/v4l2-apps/test/Makefile b/v4l2-apps/test/Makefile index faafed14d..a996c0baf 100644 --- a/v4l2-apps/test/Makefile +++ b/v4l2-apps/test/Makefile @@ -9,6 +9,7 @@ binaries = ioctl-test \ v4lgrab \ driver-test \ pixfmt-test \ + stress-buffer \ capture_example .PHONY: all clean install -- cgit v1.2.3 From d9fcd7e5495fbd0fe020223823338d21ce31dcaf Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 13 Feb 2009 12:56:07 +0100 Subject: libv4l2util: rename from libv4l2 to prevent clash with the libv4l2 conversion library From: Hans Verkuil 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 --- v4l2-apps/test/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'v4l2-apps/test/Makefile') 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 -- cgit v1.2.3 From 4e061e403e8a5ab5f041a54a6852c69e6b00b368 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 13 Feb 2009 13:06:29 +0100 Subject: v4l2-apps: move libraries around to make the directory tree flatter From: Hans Verkuil 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 --- v4l2-apps/test/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'v4l2-apps/test/Makefile') diff --git a/v4l2-apps/test/Makefile b/v4l2-apps/test/Makefile index e3879bc5e..554940edd 100644 --- a/v4l2-apps/test/Makefile +++ b/v4l2-apps/test/Makefile @@ -21,10 +21,10 @@ clean:: install: -../lib/libv4l2util.a: ../lib/v4l2_driver.c ../lib/frequencies.c - make -C ../lib libv4l2util.a +../libv4l2util/libv4l2util.a: ../libv4l2util/v4l2_driver.c ../libv4l2util/frequencies.c + make -C ../libv4l2util libv4l2util.a -driver-test: driver-test.o ../lib/libv4l2util.a +driver-test: driver-test.o ../libv4l2util/libv4l2util.a pixfmt-test: pixfmt-test.o $(CC) $(LDFLAGS) $^ $(LOADLIBES) $(LDLIBS) -o $@ -lX11 -- cgit v1.2.3 From 31eab17a63b92f738bcaa74a7355a345f9919378 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Fri, 13 Feb 2009 13:23:52 +0100 Subject: v4l2-apps: rename capture_example to capture-example From: Hans Verkuil Follow the existing naming conventions. Also did a few small cleanups in this source. Priority: normal Signed-off-by: Hans Verkuil --- v4l2-apps/test/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'v4l2-apps/test/Makefile') diff --git a/v4l2-apps/test/Makefile b/v4l2-apps/test/Makefile index 554940edd..d118b9210 100644 --- a/v4l2-apps/test/Makefile +++ b/v4l2-apps/test/Makefile @@ -10,7 +10,7 @@ binaries = ioctl-test \ driver-test \ pixfmt-test \ stress-buffer \ - capture_example + capture-example .PHONY: all clean install -- cgit v1.2.3