diff options
| author | Gaetan Nadon <memsize@videotron.ca> | 2011-11-19 15:33:33 -0500 |
|---|---|---|
| committer | Martin-Éric Racine <martin-eric.racine@iki.fi> | 2011-11-21 10:33:11 +0200 |
| commit | fa0e88bfe00baa648ab3b1184b56f7dc5536aa21 (patch) | |
| tree | b87accc5777bd3a3dde813bc4dc8ecf4ba7bff49 | |
| parent | 03529b7b35fa8d7b5bac277d6abe1caf0557301a (diff) | |
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>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 12 | ||||
| -rw-r--r-- | src/z4l.c (renamed from ztv/z4l.c) | 0 | ||||
| -rw-r--r-- | ztv/Makefile.am | 12 |
5 files changed, 12 insertions, 15 deletions
diff --git a/Makefile.am b/Makefile.am index 31431a8..00c84b5 100644 --- a/Makefile.am +++ b/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 diff --git a/configure.ac b/configure.ac index 26a3642..582eb46 100644 --- a/configure.ac +++ b/configure.ac @@ -144,5 +144,4 @@ AC_SUBST([DRIVER_NAME]) AC_OUTPUT([ Makefile src/Makefile - ztv/Makefile ]) diff --git a/src/Makefile.am b/src/Makefile.am index 5df0a32..1f3dfcb 100644 --- a/src/Makefile.am +++ b/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 diff --git a/ztv/Makefile.am b/ztv/Makefile.am deleted file mode 100644 index 0bc133e..0000000 --- a/ztv/Makefile.am +++ /dev/null @@ -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 |