diff options
| author | Matt Messier <mmessier@grapetv.org> | 2007-05-11 18:24:25 -0400 |
|---|---|---|
| committer | Matt Messier <mmessier@grapetv.org> | 2007-05-11 18:24:25 -0400 |
| commit | 913f9b8ee348c91717cdf5cd4c8a4d56b9d22a5e (patch) | |
| tree | 302709e5d1b4467072623bd925a460fa19daa36b /src/video_out/vidix | |
| parent | 00dccb98dfe1ff21e14275b09806cbe4d69a3273 (diff) | |
| download | xine-lib-913f9b8ee348c91717cdf5cd4c8a4d56b9d22a5e.tar.gz xine-lib-913f9b8ee348c91717cdf5cd4c8a4d56b9d22a5e.tar.bz2 | |
Another pass at cleaning up Makefile.am files. More to come.
Diffstat (limited to 'src/video_out/vidix')
| -rw-r--r-- | src/video_out/vidix/Makefile.am | 17 | ||||
| -rw-r--r-- | src/video_out/vidix/drivers/Makefile.am | 48 |
2 files changed, 28 insertions, 37 deletions
diff --git a/src/video_out/vidix/Makefile.am b/src/video_out/vidix/Makefile.am index e002c56f0..7f19e7ce8 100644 --- a/src/video_out/vidix/Makefile.am +++ b/src/video_out/vidix/Makefile.am @@ -1,21 +1,16 @@ include $(top_srcdir)/misc/Makefile.common -EXTRA_DIST = README vidix.txt - SUBDIRS = drivers -AM_CFLAGS = $(STATIC) -AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \ - -I$(top_builddir)/src/video_out/libdha +AM_CFLAGS = $(DEFAULT_OCFLAGS) +AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix -I$(top_builddir)/src/video_out/libdha -if HAVE_VIDIX -vidix_lib = libvidix.la -endif +EXTRA_DIST = README vidix.txt -noinst_LTLIBRARIES = $(vidix_lib) +noinst_HEADERS = fourcc.h vidix.h vidixlib.h + +noinst_LTLIBRARIES = libvidix.la libvidix_la_SOURCES = vidixlib.c libvidix_la_LIBADD = $(DYNAMIC_LD_LIBS) $(top_builddir)/src/video_out/libdha/libdha.la -noinst_HEADERS = fourcc.h vidix.h vidixlib.h - diff --git a/src/video_out/vidix/drivers/Makefile.am b/src/video_out/vidix/drivers/Makefile.am index 23272e4c9..1ad68da26 100644 --- a/src/video_out/vidix/drivers/Makefile.am +++ b/src/video_out/vidix/drivers/Makefile.am @@ -1,15 +1,17 @@ include $(top_srcdir)/misc/Makefile.common -AM_CFLAGS = $(DEFAULT_OCFLAGS) +AM_CFLAGS = $(DEFAULT_OCFLAGS) AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \ - -I$(top_srcdir)/src/video_out/libdha \ - -I$(top_builddir)/src/video_out/libdha -AM_LDFLAGS = $(xineplug_ldflags) + -I$(top_srcdir)/src/video_out/libdha -I$(top_builddir)/src/video_out/libdha +AM_LDFLAGS = $(xineplug_ldflags) EXTRA_DIST = genfb_vid.c +noinst_HEADERS = mach64.h glint_regs.h pm3_regs.h radeon.h savage_regs.h \ + cyberblade_regs.h unichrome_regs.h sis_defs.h sis_regs.h + if HAVE_VIDIX -vidix_drivers = \ +vidix_LTLIBRARIES = \ mach64_vid.la \ mga_crtc2_vid.la \ mga_vid.la \ @@ -24,39 +26,33 @@ vidix_drivers = \ savage_vid.la endif -vidix_LTLIBRARIES = $(vidix_drivers) - -radeon_vid_la_SOURCES = radeon_vid.c -radeon_vid_la_LIBADD = -lm - -rage128_vid_la_SOURCES = radeon_vid.c -rage128_vid_la_LIBADD = -lm -rage128_vid_la_CPPFLAGS = $(AM_CPPFLAGS) -DRAGE128 - -pm2_vid_la_SOURCES = pm2_vid.c - -pm3_vid_la_SOURCES = pm3_vid.c +cyberblade_vid_la_SOURCES = cyberblade_vid.c mach64_vid_la_SOURCES = mach64_vid.c -mga_vid_la_SOURCES = mga_vid.c -mga_vid_la_LIBADD = -lm - mga_crtc2_vid_la_SOURCES = mga_vid.c mga_crtc2_vid_la_LIBADD = -lm mga_crtc2_vid_la_CPPFLAGS = $(AM_CPPFLAGS) -DCRTC2 -cyberblade_vid_la_SOURCES = cyberblade_vid.c - -unichrome_vid_la_SOURCES = unichrome_vid.c +mga_vid_la_SOURCES = mga_vid.c +mga_vid_la_LIBADD = -lm nvidia_vid_la_SOURCES = nvidia_vid.c -sis_vid_la_SOURCES = sis_vid.c sis_bridge.c +pm2_vid_la_SOURCES = pm2_vid.c + +pm3_vid_la_SOURCES = pm3_vid.c + +radeon_vid_la_SOURCES = radeon_vid.c +radeon_vid_la_LIBADD = -lm + +rage128_vid_la_SOURCES = radeon_vid.c +rage128_vid_la_LIBADD = -lm +rage128_vid_la_CPPFLAGS = $(AM_CPPFLAGS) -DRAGE128 savage_vid_la_SOURCES = savage_vid.c savage_vid_la_LIBADD = -lm -noinst_HEADERS = mach64.h glint_regs.h pm3_regs.h radeon.h savage_regs.h \ - cyberblade_regs.h unichrome_regs.h sis_defs.h sis_regs.h +sis_vid_la_SOURCES = sis_vid.c sis_bridge.c +unichrome_vid_la_SOURCES = unichrome_vid.c |