summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGaetan Nadon <memsize@videotron.ca>2011-11-15 23:02:34 (GMT)
committerMartin-√Čric Racine <martin-eric.racine@iki.fi>2011-11-21 08:33:09 (GMT)
commite4b771572d7b0797a794340ab8fb8b1db91a5eb1 (patch)
tree1b451acc947104594c184adb6161bf2af40a35bd
parent2b3767b9e424ce371c342c9c9a2f2ae1f61df1fd (diff)
Move ztv driver to it's own directory
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@videotron.ca>
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac1
-rw-r--r--src/Makefile.am8
-rw-r--r--ztv/Makefile.am15
-rw-r--r--ztv/z4l.c (renamed from src/z4l.c)0
5 files changed, 18 insertions, 9 deletions
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
index d44ff73..d44ff73 100644
--- a/src/z4l.c
+++ b/ztv/z4l.c