From f931a4a484a5d7eb2685aa9f2597918455c54fbf Mon Sep 17 00:00:00 2001 From: Antoine Cellerier Date: Sun, 4 Jan 2009 17:40:00 +0100 Subject: [PATCH] Move v4l2.c back to the access/ directory (No more splitting up planed in the forseable future) --- configure.ac | 1 - modules/access/Modules.am | 3 ++- modules/access/{v4l2 => }/v4l2.c | 0 modules/access/v4l2/Modules.am | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) rename modules/access/{v4l2 => }/v4l2.c (100%) delete mode 100644 modules/access/v4l2/Modules.am diff --git a/configure.ac b/configure.ac index 540c7fdf31..4899ba211f 100644 --- a/configure.ac +++ b/configure.ac @@ -5824,7 +5824,6 @@ AC_CONFIG_FILES([ modules/access/rtp/Makefile modules/access/rtsp/Makefile modules/access/rtmp/Makefile - modules/access/v4l2/Makefile modules/access/vcd/Makefile modules/access/vcdx/Makefile modules/access/screen/Makefile diff --git a/modules/access/Modules.am b/modules/access/Modules.am index 2e696f4eb1..971b93b565 100644 --- a/modules/access/Modules.am +++ b/modules/access/Modules.am @@ -3,7 +3,7 @@ # obviously does not. Here is a fix for that. LIBTOOL=@LIBTOOL@ --tag=CC -BASE_SUBDIRS = dvb mms cdda rtp rtsp rtmp v4l2 vcd vcdx screen +BASE_SUBDIRS = dvb mms cdda rtp rtsp rtmp vcd vcdx screen EXTRA_SUBDIRS = bda dshow SUBDIRS = $(BASE_SUBDIRS) DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS) @@ -29,6 +29,7 @@ SOURCES_dc1394 = dc1394.c SOURCES_access_fake = fake.c SOURCES_pvr = pvr.c videodev2.h SOURCES_v4l = v4l.c videodev_mjpeg.h +SOURCES_v4l2 = v4l2.c SOURCES_qtcapture = qtcapture.m SOURCES_cdda = \ cdda.c \ diff --git a/modules/access/v4l2/v4l2.c b/modules/access/v4l2.c similarity index 100% rename from modules/access/v4l2/v4l2.c rename to modules/access/v4l2.c diff --git a/modules/access/v4l2/Modules.am b/modules/access/v4l2/Modules.am deleted file mode 100644 index 80d1c8fb9c..0000000000 --- a/modules/access/v4l2/Modules.am +++ /dev/null @@ -1 +0,0 @@ -SOURCES_v4l2 = v4l2.c -- 2.39.2