[Xorg-driver-geode] [PATCH 1/3] Move ztv driver to it's own directory

[Gaetan Nadon]

The convention is to have the video driver (geode) in the src subdir
and any other targets (utils, apps, other drivers) in their own
directory. It makes it much simpler to right a correct makefile
and to set conditional compile.

This highlighted a few things to fix. For now, the directory includes
have not been copied as they are required. The AM_CCASFLAGS is not required
either as there is no assembler.

Other than that, the gcc command issued has no differences. Other unrequired
defines could be removed later.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---
 Makefile.am        |    3 ++-
 configure.ac       |    1 +
 src/Makefile.am    |    8 --------
 ztv/Makefile.am    |   15 +++++++++++++++
 {src => ztv}/z4l.c |    0
 5 files changed, 18 insertions(+), 9 deletions(-)
 create mode 100644 ztv/Makefile.am
 rename {src => ztv}/z4l.c (100%)

diff --git a/Makefile.am b/Makefile.am
index 74e0bd3..31431a8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,7 +18,8 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-SUBDIRS = src
+SUBDIRS = src ztv
+
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 EXTRA_DIST = autogen.sh
 
diff --git a/configure.ac b/configure.ac
index 483caff..b93aa35 100644
--- a/configure.ac
+++ b/configure.ac
@@ -135,4 +135,5 @@ AC_SUBST([DRIVER_NAME])
 AC_OUTPUT([
 	Makefile
 	src/Makefile
+	ztv/Makefile
 ])
diff --git a/src/Makefile.am b/src/Makefile.am
index 6817ea4..85c2115 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -144,11 +144,3 @@ EXTRA_DIST = \
   \
         gx_vga.c \
         lx_vga.c
-
-ztv_drv_la_LTLIBRARIES = ztv_drv.la
-ztv_drv_la_LDFLAGS = -module -avoid-version
-ztv_drv_ladir = @moduledir@/drivers
-
-ztv_drv_la_SOURCES = \
-        z4l.c
-
diff --git a/ztv/Makefile.am b/ztv/Makefile.am
new file mode 100644
index 0000000..08902fc
--- /dev/null
+++ b/ztv/Makefile.am
@@ -0,0 +1,15 @@
+
+AM_CFLAGS =			\
+	$(XORG_CFLAGS)		\
+	$(AMD_CFLAGS)		\
+	-DHAVE_GX		\
+	-DHAVE_LX		\
+	-DAMD_V4L2_VIDEO	\
+	-DOPT_ACCEL		\
+	-DLINUX_2_6
+
+ztv_drv_la_LTLIBRARIES = ztv_drv.la
+ztv_drv_la_LDFLAGS = -module -avoid-version
+ztv_drv_ladir = $(moduledir)/drivers
+
+ztv_drv_la_SOURCES = z4l.c
diff --git a/src/z4l.c b/ztv/z4l.c
similarity index 100%
rename from src/z4l.c
rename to ztv/z4l.c
-- 
1.7.4.1