summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin-Éric Racine <martin-eric.racine@iki.fi>2011-11-13 03:40:01 +0200
committerMartin-Éric Racine <martin-eric.racine@iki.fi>2011-11-13 03:40:01 +0200
commitee52d73fd2c68740b1ff3cdb5b1bf2a6d941090d (patch)
treeca01a4d38c02a6c81953f0e260fd2f92fbbf666a
parentd193a42b3596ceb9dfaa66af71edd1f15ecc75bd (diff)
Move the z4l.c test to src/Makefile.am where it should be.
-rw-r--r--Makefile.am9
-rw-r--r--src/Makefile.am2
2 files changed, 2 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am
index 50d8aa9..74e0bd3 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -31,12 +31,3 @@ ChangeLog:
$(CHANGELOG_CMD)
dist-hook: ChangeLog INSTALL
-
-#if BUILD_Z4L
- 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
-#endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 6817ea4..61e17f3 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -145,10 +145,12 @@ EXTRA_DIST = \
gx_vga.c \
lx_vga.c
+#if BUILD_Z4L
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
+#endif