From a0ef9efea8b7951bcba0bfbcb8bca93e810eeb84 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Cl=C3=A9ment=20Stenac?= Date: Wed, 19 Jul 2006 09:45:02 +0000 Subject: [PATCH] Move v4l and pvr into the main access directory. No need for a separate directory for 1 file --- configure.ac | 2 -- modules/access/Modules.am | 2 ++ modules/access/{pvr => }/pvr.c | 0 modules/access/pvr/Modules.am | 1 - modules/access/{v4l => }/v4l.c | 0 modules/access/v4l/Modules.am | 1 - modules/access/{pvr => }/videodev2.h | 0 modules/access/{v4l => }/videodev_mjpeg.h | 0 8 files changed, 2 insertions(+), 4 deletions(-) rename modules/access/{pvr => }/pvr.c (100%) delete mode 100644 modules/access/pvr/Modules.am rename modules/access/{v4l => }/v4l.c (100%) delete mode 100644 modules/access/v4l/Modules.am rename modules/access/{pvr => }/videodev2.h (100%) rename modules/access/{v4l => }/videodev_mjpeg.h (100%) diff --git a/configure.ac b/configure.ac index 42129eb236..5addd658f6 100644 --- a/configure.ac +++ b/configure.ac @@ -5489,8 +5489,6 @@ AC_CONFIG_FILES([ modules/access/dshow/Makefile modules/access/dvb/Makefile modules/access/mms/Makefile - modules/access/pvr/Makefile - modules/access/v4l/Makefile modules/access/cdda/Makefile modules/access/rtsp/Makefile modules/access/vcd/Makefile diff --git a/modules/access/Modules.am b/modules/access/Modules.am index 09f3457daa..948a1be85a 100644 --- a/modules/access/Modules.am +++ b/modules/access/Modules.am @@ -10,6 +10,8 @@ SOURCES_access_gnomevfs = gnomevfs.c SOURCES_dvdnav = dvdnav.c SOURCES_dvdread = dvdread.c SOURCES_access_fake = fake.c +SOURCES_pvr = pvr.c videodev2.h +SOURCES_v4l = v4l.c videodev_mjpeg.h SOURCES_cdda = \ cdda.c \ vcd/cdrom.c \ diff --git a/modules/access/pvr/pvr.c b/modules/access/pvr.c similarity index 100% rename from modules/access/pvr/pvr.c rename to modules/access/pvr.c diff --git a/modules/access/pvr/Modules.am b/modules/access/pvr/Modules.am deleted file mode 100644 index a9b15916eb..0000000000 --- a/modules/access/pvr/Modules.am +++ /dev/null @@ -1 +0,0 @@ -SOURCES_pvr = pvr.c videodev2.h diff --git a/modules/access/v4l/v4l.c b/modules/access/v4l.c similarity index 100% rename from modules/access/v4l/v4l.c rename to modules/access/v4l.c diff --git a/modules/access/v4l/Modules.am b/modules/access/v4l/Modules.am deleted file mode 100644 index bfdd8546a2..0000000000 --- a/modules/access/v4l/Modules.am +++ /dev/null @@ -1 +0,0 @@ -SOURCES_v4l = v4l.c videodev_mjpeg.h diff --git a/modules/access/pvr/videodev2.h b/modules/access/videodev2.h similarity index 100% rename from modules/access/pvr/videodev2.h rename to modules/access/videodev2.h diff --git a/modules/access/v4l/videodev_mjpeg.h b/modules/access/videodev_mjpeg.h similarity index 100% rename from modules/access/v4l/videodev_mjpeg.h rename to modules/access/videodev_mjpeg.h -- 2.39.2