Move back ztv with geode driver

Now we have a clean separation between CPP flags and C Flags
Only the C Flags apply to both geode and ztv driver, however
it is not worth doing a per target compilation.

Should some flags become mutually exclusive and if we want to have
both target in the same makefile, add the incompatible flag
on the appropriate target, example:

geode_drv_la_CFLAGS = $(AM_CFLAGS) -newCFlag
and/or
geode_drv_la_CPPFLAGS = $(AM_CPPFLAGS) -newCPPFlag

Note that both AM_CFLAGS and AM_CPPFLAGS are picked-up by both
geode and ztv driver target.

Signed-off-by: Gaetan Nadon <memsize@videotron.ca>

Makefile.am

@@ -18,7 +18,7 @@
 #  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 ztv
+SUBDIRS = src
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
 EXTRA_DIST = autogen.sh

configure.ac

@@ -144,5 +144,4 @@ AC_SUBST([DRIVER_NAME])
 AC_OUTPUT([
 	Makefile
 	src/Makefile
-	ztv/Makefile
 ])

src/Makefile.am

@@ -37,7 +37,7 @@ AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) $(M32_CFLAGS)
 
 geode_drv_la_LTLIBRARIES = geode_drv.la
 geode_drv_la_LDFLAGS = -module -avoid-version
-geode_drv_ladir = @moduledir@/drivers
+geode_drv_ladir = $(moduledir)/drivers
 
 geode_drv_la_SOURCES =		\
 	cimarron.c		\
@@ -142,3 +142,13 @@ EXTRA_DIST =			\
 				\
         gx_vga.c		\
         lx_vga.c
+
+if BUILD_ZTV
+
+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 BUILD_ZTV

ztv/Makefile.am

@@ -1,12 +0,0 @@
-
-if BUILD_ZTV
-
-AM_CFLAGS = $(XORG_CFLAGS) $(CWARNFLAGS) $(M32_CFLAGS)
-
-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 BUILD_ZTV