diff options
Diffstat (limited to 'src/video_out')
| -rw-r--r-- | src/video_out/Makefile.am | 119 | ||||
| -rw-r--r-- | src/video_out/libdha/Makefile.am | 22 | ||||
| -rw-r--r-- | src/video_out/libdha/kernelhelper/Makefile.am | 43 | ||||
| -rw-r--r-- | src/video_out/macosx/Makefile.am | 25 | ||||
| -rw-r--r-- | src/video_out/vidix/Makefile.am | 17 | ||||
| -rw-r--r-- | src/video_out/vidix/drivers/Makefile.am | 62 |
6 files changed, 133 insertions, 155 deletions
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 148eda84c..a4f219b9c 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -1,14 +1,30 @@ include $(top_srcdir)/misc/Makefile.common -AM_CPPFLAGS = -DXINE_COMPILE -AM_LDFLAGS = $(xineplug_ldflags) +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_LDFLAGS = $(xineplug_ldflags) +AM_OBJCFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) -SUBDIRS = libdha vidix macosx +SUBDIRS = + +if BUILD_DHA_KMOD +SUBDIRS += libdha +endif + +# vidix depends on portions of dha +if ENABLE_VIDIX +if !BUILD_DHA_KMOD +SUBDIRS += libdha +endif +SUBDIRS += vidix +endif + +if ENABLE_MACOSX_VIDEO +SUBDIRS += macosx +endif EXTRA_DIST = video_out_directfb.c video_out_directfb_fb.c video_out_directfb_x.c video_out_directx.c video_out_macosx.m -VIDIX_CFLAGS = -I$(top_builddir)/src/video_out/vidix \ - -I$(top_srcdir)/src/video_out/vidix +noinst_HEADERS = deinterlace.h video_out_syncfb.h yuv2rgb.h x11osd.h xcbosd.h if HAVE_X11 X11OSD = x11osd.c @@ -16,72 +32,72 @@ xshm_module = xineplug_vo_out_xshm.la if HAVE_XV xv_module = xineplug_vo_out_xv.la endif -if HAVE_XVMC +if ENABLE_XVMC xvmc_module = xineplug_vo_out_xvmc.la endif -if HAVE_XXMC +if ENABLE_XXMC xxmc_module = xineplug_vo_out_xxmc.la endif -if HAVE_OPENGL +if ENABLE_OPENGL opengl_module = xineplug_vo_out_opengl.la endif -if HAVE_SYNCFB +if ENABLE_SYNCFB syncfb_module = xineplug_vo_out_syncfb.la endif -if HAVE_SUNFB -if HAVE_SUNDGA +if ENABLE_SUNFB +if ENABLE_SUNDGA pgx64_module = xineplug_vo_out_pgx64.la pgx32_module = xineplug_vo_out_pgx32.la endif endif endif -if HAVE_XCB +if ENABLE_XCB XCBOSD = xcbosd.c -if HAVE_XCBSHM +if ENABLE_XCBSHM xcbshm_module = xineplug_vo_out_xcbshm.la endif -if HAVE_XCBXV +if ENABLE_XCBXV xcbxv_module = xineplug_vo_out_xcbxv.la endif endif -if HAVE_VIDIX +if ENABLE_VIDIX vidix_module = xineplug_vo_out_vidix.la endif -if HAVE_AA +if ENABLE_AA aa_module = xineplug_vo_out_aa.la endif -if HAVE_CACA +if ENABLE_CACA caca_module = xineplug_vo_out_caca.la endif -if HAVE_FB +if ENABLE_FB fb_module = xineplug_vo_out_fb.la endif -if HAVE_DIRECTFB +if ENABLE_DIRECTFB directfb_module = xineplug_vo_out_directfb.la if HAVE_X11 directfb_module += xineplug_vo_out_xdirectfb.la endif endif -if HAVE_SDL +if ENABLE_SDL sdl_module = xineplug_vo_out_sdl.la endif -if HAVE_STK +if ENABLE_STK stk_module = xineplug_vo_out_stk.la endif -if HAVE_DIRECTX +if ENABLE_DIRECTX directx_module = xineplug_vo_out_directx.la endif -if HAVE_MACOSX_VIDEO +if ENABLE_MACOSX_VIDEO macosx_module = xineplug_vo_out_macosx.la endif @@ -104,101 +120,94 @@ xineplug_LTLIBRARIES = $(xshm_module) $(xv_module) $(xvmc_module) \ xineplug_vo_out_xcbshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c video_out_xcbshm.c $(XCBOSD) xineplug_vo_out_xcbshm_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(XCB_LIBS) $(XCBSHM_LIBS) -xineplug_vo_out_xcbshm_la_CFLAGS = $(VISIBILITY_FLAG) $(MLIB_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS) +xineplug_vo_out_xcbshm_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS) $(XCB_CFLAGS) $(XCBSHM_CFLAGS) xineplug_vo_out_xcbxv_la_SOURCES = deinterlace.c video_out_xcbxv.c $(XCBOSD) xineplug_vo_out_xcbxv_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) $(XCBXV_LIBS) $(XCB_LIBS) -xineplug_vo_out_xcbxv_la_CFLAGS = $(VISIBILITY_FLAG) $(XCB_CFLAGS) $(XCBXV_CFLAGS) +xineplug_vo_out_xcbxv_la_CFLAGS = $(AM_CFLAGS) $(XCB_CFLAGS) $(XCBXV_CFLAGS) xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \ video_out_xshm.c $(X11OSD) xineplug_vo_out_xshm_la_LIBADD = $(MLIB_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) -xineplug_vo_out_xshm_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) $(MLIB_CFLAGS) -fno-strict-aliasing +xineplug_vo_out_xshm_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(MLIB_CFLAGS) -fno-strict-aliasing xineplug_vo_out_xv_la_SOURCES = $(X11OSD) deinterlace.c video_out_xv.c xineplug_vo_out_xv_la_LIBADD = $(XV_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) -xineplug_vo_out_xv_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) $(XV_CFLAGS) -fno-strict-aliasing +xineplug_vo_out_xv_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(XV_CFLAGS) -fno-strict-aliasing xineplug_vo_out_xvmc_la_SOURCES = deinterlace.c video_out_xvmc.c xineplug_vo_out_xvmc_la_LIBADD = $(XVMC_LIBS) $(XV_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) -xineplug_vo_out_xvmc_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) $(XV_CFLAGS) +xineplug_vo_out_xvmc_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(XV_CFLAGS) xineplug_vo_out_xxmc_la_SOURCES = $(X11OSD) deinterlace.c video_out_xxmc.c\ xvmc_mocomp.c xvmc_vld.c xxmc.h xineplug_vo_out_xxmc_la_LIBADD = $(XXMC_LIBS) $(XV_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) -xineplug_vo_out_xxmc_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) $(XV_CFLAGS) -fno-strict-aliasing +xineplug_vo_out_xxmc_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(XV_CFLAGS) -fno-strict-aliasing xineplug_vo_out_opengl_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \ video_out_opengl.c myglext.h $(X11OSD) xineplug_vo_out_opengl_la_LIBADD = $(MLIB_LIBS) $(OPENGL_LIBS) $(GLUT_LIBS) \ $(GLU_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) $(DYNAMIC_LD_LIBS) -xineplug_vo_out_opengl_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) $(MLIB_CFLAGS) -fno-strict-aliasing +xineplug_vo_out_opengl_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(MLIB_CFLAGS) -fno-strict-aliasing xineplug_vo_out_syncfb_la_SOURCES = video_out_syncfb.c xineplug_vo_out_syncfb_la_LIBADD = $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) -xineplug_vo_out_syncfb_la_CFLAGS = $(VISIBILITY_FLAG) xineplug_vo_out_pgx64_la_SOURCES = video_out_pgx64.c xineplug_vo_out_pgx64_la_LIBADD = $(XINE_LIB) $(X_LIBS) $(SUNDGA_LIBS) $(PTHREAD_LIBS) -xineplug_vo_out_pgx64_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) +xineplug_vo_out_pgx64_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) +xineplug_vo_out_pgx64_la_CPPFLAGS = $(AM_CPPFLAGS) $(SUNDGA_CPPFLAGS) xineplug_vo_out_pgx32_la_SOURCES = video_out_pgx32.c xineplug_vo_out_pgx32_la_LIBADD = $(XINE_LIB) $(X_LIBS) $(SUNDGA_LIBS) $(PTHREAD_LIBS) -xineplug_vo_out_pgx32_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) +xineplug_vo_out_pgx32_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) +xineplug_vo_out_pgx32_la_CPPFLAGS = $(AM_CPPFLAGS) $(SUNDGA_CPPFLAGS) xineplug_vo_out_vidix_la_SOURCES = video_out_vidix.c $(X11OSD) xineplug_vo_out_vidix_la_LIBADD = $(XINE_LIB) $(X_LIBS) \ $(top_builddir)/src/video_out/vidix/libvidix.la $(PTHREAD_LIBS) -xineplug_vo_out_vidix_la_CFLAGS = $(VISIBILITY_FLAG) $(VIDIX_CFLAGS) $(X_CFLAGS) -fno-strict-aliasing +xineplug_vo_out_vidix_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) -fno-strict-aliasing +xineplug_vo_out_vidix_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/src/video_out/vidix \ + -I$(top_srcdir)/src/video_out/vidix + xineplug_vo_out_aa_la_SOURCES = video_out_aa.c xineplug_vo_out_aa_la_LIBADD = $(AALIB_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) -xineplug_vo_out_aa_la_CFLAGS = $(VISIBILITY_FLAG) $(AALIB_CFLAGS) +xineplug_vo_out_aa_la_CFLAGS = $(AM_CFLAGS) $(AALIB_CFLAGS) xineplug_vo_out_caca_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \ video_out_caca.c xineplug_vo_out_caca_la_LIBADD = $(CACA_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) -xineplug_vo_out_caca_la_CFLAGS = $(VISIBILITY_FLAG) $(CACA_CFLAGS) +xineplug_vo_out_caca_la_CFLAGS = $(AM_CFLAGS) $(CACA_CFLAGS) xineplug_vo_out_fb_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \ video_out_fb.c xineplug_vo_out_fb_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) -xineplug_vo_out_fb_la_CFLAGS = $(VISIBILITY_FLAG) $(MLIB_CFLAGS) +xineplug_vo_out_fb_la_CFLAGS = $(AM_CFLAGS) $(MLIB_CFLAGS) xineplug_vo_out_directfb_la_SOURCES = video_out_directfb_fb.c xineplug_vo_out_directfb_la_LIBADD = $(XINE_LIB) $(DIRECTFB_LIBS) $(PTHREAD_LIBS) -xineplug_vo_out_directfb_la_CFLAGS = $(VISIBILITY_FLAG) $(DIRECTFB_CFLAGS) -fno-strict-aliasing +xineplug_vo_out_directfb_la_CFLAGS = $(AM_CFLAGS) $(DIRECTFB_CFLAGS) -fno-strict-aliasing xineplug_vo_out_xdirectfb_la_SOURCES = video_out_directfb_x.c $(X11OSD) xineplug_vo_out_xdirectfb_la_LIBADD = $(XINE_LIB) $(DIRECTFB_LIBS) $(X_LIBS) $(PTHREAD_LIBS) -xineplug_vo_out_xdirectfb_la_CFLAGS = $(VISIBILITY_FLAG) $(DIRECTFB_CFLAGS) -fno-strict-aliasing +xineplug_vo_out_xdirectfb_la_CFLAGS = $(AM_CFLAGS) $(DIRECTFB_CFLAGS) -fno-strict-aliasing xineplug_vo_out_sdl_la_SOURCES = video_out_sdl.c xineplug_vo_out_sdl_la_LIBADD = $(SDL_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) -xineplug_vo_out_sdl_la_CFLAGS = $(VISIBILITY_FLAG) $(X_CFLAGS) $(SDL_CFLAGS) +xineplug_vo_out_sdl_la_CFLAGS = $(AM_CFLAGS) $(X_CFLAGS) $(SDL_CFLAGS) xineplug_vo_out_stk_la_SOURCES = video_out_stk.c xineplug_vo_out_stk_la_LIBADD = $(XINE_LIB) $(LIBSTK_LIBS) $(PTHREAD_LIBS) -xineplug_vo_out_stk_la_CFLAGS = $(VISIBILITY_FLAG) $(LIBSTK_CFLAGS) +xineplug_vo_out_stk_la_CFLAGS = $(AM_CFLAGS) $(LIBSTK_CFLAGS) xineplug_vo_out_directx_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c video_out_directx.c -xineplug_vo_out_directx_la_CPPFLAGS = $(AM_CPPFLAGS) $(DIRECTX_CPPFLAGS) xineplug_vo_out_directx_la_LIBADD = $(DIRECTX_VIDEO_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) -xineplug_vo_out_directx_la_CFLAGS = $(VISIBILITY_FLAG) +xineplug_vo_out_directx_la_CPPFLAGS = $(AM_CPPFLAGS) $(DIRECTX_CPPFLAGS) xineplug_vo_out_none_la_SOURCES = video_out_none.c xineplug_vo_out_none_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) -xineplug_vo_out_none_la_CFLAGS = $(VISIBILITY_FLAG) xineplug_vo_out_macosx_la_SOURCES = video_out_macosx.m -xineplug_vo_out_macosx_la_CPPFLAGS = $(AM_CPPFLAGS) $(X_CFLAGS) $(MLIB_CFLAGS) -xineplug_vo_out_macosx_la_OBJCFLAGS = $(VISIBILITY_FLAG) -xineplug_vo_out_macosx_la_LIBADD = $(MLIB_LIBS) $(OPENGL_LIBS) $(GLUT_LIBS) \ - $(GLU_LIBS) $(X_LIBS) $(XINE_LIB) $(PTHREAD_LIBS) -# The "-Wl,-framework -Wl,Cocoa" is needed for libtool versions before -# 1.5.x (1.257): the default version that ships with Mac OS X is 1.5 (1.1220) -xineplug_vo_out_macosx_la_LDFLAGS = $(AM_LDFLAGS) \ - -Wl,-framework -Wl,Cocoa -framework Cocoa -framework OpenGL - -noinst_HEADERS = deinterlace.h video_out_syncfb.h \ - yuv2rgb.h x11osd.h xcbosd.h +xineplug_vo_out_macosx_la_LIBADD = $(XINE_LIB) $(PTHREAD_LIBS) +xineplug_vo_out_macosx_la_LDFLAGS = $(AM_LDFLAGS) -framework Cocoa -framework OpenGL diff --git a/src/video_out/libdha/Makefile.am b/src/video_out/libdha/Makefile.am index 8d94347d1..05aebb704 100644 --- a/src/video_out/libdha/Makefile.am +++ b/src/video_out/libdha/Makefile.am @@ -1,19 +1,23 @@ include $(top_srcdir)/misc/Makefile.common -EXTRA_DIST = README pci_db2c.awk +SUBDIRS = bin oth sysdep -SUBDIRS = bin kernelhelper oth sysdep +if BUILD_DHA_KMOD +SUBDIRS += kernelhelper +endif -AM_CFLAGS = @STATIC@ +AM_CFLAGS = $(DEFAULT_OCFLAGS) -if HAVE_VIDIX -dha_lib = libdha.la -endif +EXTRA_DIST = README pci_db2c.awk awk_generated = pci_dev_ids.c pci_ids.h pci_names.c pci_names.h pci_vendors.h CLEANFILES = $(awk_generated) -noinst_LTLIBRARIES = $(dha_lib) +noinst_HEADERS = AsmMacros.h libdha.h pci_ids.h pci_names.h pci_vendors.h + +if ENABLE_VIDIX +noinst_LTLIBRARIES = libdha.la +endif libdha_la_SOURCES = libdha.c mtrr.c pci.c mmi.c ports.c irq.c cpu_flush.c nodist_libdha_la_SOURCES = pci_names.c @@ -23,8 +27,6 @@ EXTRA_PROGRAMS = test test_SOURCES = test.c test_LDADD = $(top_builddir)/src/video_out/libdha/libdha.la -noinst_HEADERS = AsmMacros.h libdha.h pci_ids.h pci_names.h pci_vendors.h - ## for OpenBSD LIBS += -li386 ## We have to create some files, on the fly, this is why this rule is needed. @@ -33,7 +35,7 @@ oth/pci.db: $(awk_generated): pci_db2c.awk oth/pci.db LC_ALL=C $(AWK) -f $(top_srcdir)/src/video_out/libdha/pci_db2c.awk \ - $(top_srcdir)/src/video_out/libdha/oth/pci.db + $(top_srcdir)/src/video_out/libdha/oth/pci.db pci_names.lo: $(awk_generated) source='$*.c' object='$@' libtool=yes \ diff --git a/src/video_out/libdha/kernelhelper/Makefile.am b/src/video_out/libdha/kernelhelper/Makefile.am index 82a37eae3..fffaab433 100644 --- a/src/video_out/libdha/kernelhelper/Makefile.am +++ b/src/video_out/libdha/kernelhelper/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = README dhahelper.c -KCFLAGS = -O2 -Wall -D__KERNEL__ -DMODULE -include `echo @LINUX_INCLUDE@ | sed -e 's/\-I//g'`/linux/modversions.h +KCFLAGS = -O2 -Wall -D__KERNEL__ -DMODULE -include `echo $(LINUX_INCLUDE) | sed -e 's/\-I//g'`/linux/modversions.h KVERSION = $(shell $(SHELL) -c 'uname -r') moddir = /lib/modules/$(KVERSION)/misc @@ -10,10 +10,8 @@ moddir = /lib/modules/$(KVERSION)/misc KCOMPILE = $(CC) $(CFLAGS) $(KCFLAGS) $(INCLUDES) $(LINUX_INCLUDE) if HAVE_LINUX -if BUILD_DHA_KMOD KERNEL_MODULE = dhahelper.o endif -endif noinst_HEADERS = dhahelper.h @@ -29,25 +27,24 @@ nodes: all: $(KERNEL_MODULE) install-exec-local: $(KERNEL_MODULE) -@BUILD_DHA_KMOD_TRUE@ @$(NORMAL_INSTALL) -@BUILD_DHA_KMOD_TRUE@ $(mkinstalldirs) $(DESTDIR)$(moddir) -@BUILD_DHA_KMOD_TRUE@ @list='$(KERNEL_MODULE)'; \ -@BUILD_DHA_KMOD_TRUE@ for p in $$list; do \ -@BUILD_DHA_KMOD_TRUE@ if test -f $$p; then \ -@BUILD_DHA_KMOD_TRUE@ echo "$(INSTALL) -o root -g root -m 644 $$p $(DESTDIR)$(moddir)/$$p"; \ -@BUILD_DHA_KMOD_TRUE@ $(INSTALL) -o root -g root -m 644 $$p $(DESTDIR)$(moddir)/$$p; \ -@BUILD_DHA_KMOD_TRUE@ else :; fi; \ -@BUILD_DHA_KMOD_TRUE@ done; \ -@BUILD_DHA_KMOD_TRUE@ $(DEPMOD) -a -@BUILD_DHA_KMOD_TRUE@ if test ! -c /dev/dhahelper; then \ -@BUILD_DHA_KMOD_TRUE@ $(MAKE) nodes; \ -@BUILD_DHA_KMOD_TRUE@ fi - + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(moddir) + @list='$(KERNEL_MODULE)'; \ + for p in $$list; do \ + if test -f $$p; then \ + echo "$(INSTALL) -o root -g root -m 644 $$p $(DESTDIR)$(moddir)/$$p"; \ + $(INSTALL) -o root -g root -m 644 $$p $(DESTDIR)$(moddir)/$$p; \ + else :; fi; \ + done; \ + $(DEPMOD) -a + if test ! -c /dev/dhahelper; then \ + $(MAKE) nodes; \ + fi uninstall-local: -@BUILD_DHA_KMOD_TRUE@ @$(NORMAL_UNINSTALL) -@BUILD_DHA_KMOD_TRUE@ @list='$(KERNEL_MODULE)'; \ -@BUILD_DHA_KMOD_TRUE@ for p in $$list; do \ -@BUILD_DHA_KMOD_TRUE@ echo "rm -f $(DESTDIR)$(moddir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ -@BUILD_DHA_KMOD_TRUE@ rm -f $(DESTDIR)$(moddir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ -@BUILD_DHA_KMOD_TRUE@ done + @$(NORMAL_UNINSTALL) + @list='$(KERNEL_MODULE)'; \ + for p in $$list; do \ + echo "rm -f $(DESTDIR)$(moddir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \ + rm -f $(DESTDIR)$(moddir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \ + done diff --git a/src/video_out/macosx/Makefile.am b/src/video_out/macosx/Makefile.am index a69f30dc5..ae6a5acc8 100644 --- a/src/video_out/macosx/Makefile.am +++ b/src/video_out/macosx/Makefile.am @@ -1,27 +1,12 @@ include $(top_srcdir)/misc/Makefile.common -AM_CPPFLAGS = -DXINE_COMPILE +AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) +AM_OBJCFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) -EXTRA_DIST = \ - video_window.h \ - XineOpenGLView.m \ - XineOpenGLView.h \ - XineVideoWindow.m \ - XineVideoWindow.h - -if HAVE_MACOSX_VIDEO +xineinclude_HEADERS = video_window.h XineOpenGLView.h XineVideoWindow.h lib_LTLIBRARIES = libxineMacOSXVideo.la libxineMacOSXVideo_la_SOURCES = XineOpenGLView.m XineVideoWindow.m -# The "-Wl,-framework -Wl,..." is needed for libtool versions before -# 1.5.x (1.257): the default version that ships with Mac OS X is 1.5 (1.1220) -libxineMacOSXVideo_la_LDFLAGS = -version-info \ - $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) \ - -Wl,-framework -Wl,Cocoa -framework Cocoa \ - -Wl,-framework -Wl,OpenGL -framework OpenGL - -xineinclude_HEADERS = video_window.h XineOpenGLView.h XineVideoWindow.h - -endif - +libxineMacOSXVideo_la_LDFLAGS = $(AM_LDFLAGS) -framework Cocoa -framework OpenGL \ + -version-info $(XINE_LT_CURRENT):$(XINE_LT_REVISION):$(XINE_LT_AGE) diff --git a/src/video_out/vidix/Makefile.am b/src/video_out/vidix/Makefile.am index 2ca8f168a..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_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 - -AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \ - -I$(top_builddir)/src/video_out/libdha diff --git a/src/video_out/vidix/drivers/Makefile.am b/src/video_out/vidix/drivers/Makefile.am index f438dde36..db3adc078 100644 --- a/src/video_out/vidix/drivers/Makefile.am +++ b/src/video_out/vidix/drivers/Makefile.am @@ -1,9 +1,16 @@ include $(top_srcdir)/misc/Makefile.common +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) + EXTRA_DIST = genfb_vid.c -if HAVE_VIDIX -vidix_drivers = \ +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 + +vidix_LTLIBRARIES = \ mach64_vid.la \ mga_crtc2_vid.la \ mga_vid.la \ @@ -16,51 +23,34 @@ vidix_drivers = \ nvidia_vid.la \ sis_vid.la \ savage_vid.la -endif -vidix_LTLIBRARIES = $(vidix_drivers) - -radeon_vid_la_SOURCES = radeon_vid.c -radeon_vid_la_LDFLAGS = -avoid-version -module -lm - -rage128_vid_la_SOURCES = radeon_vid.c -rage128_vid_la_LDFLAGS = -avoid-version -module -lm -rage128_vid_la_CFLAGS = -DRAGE128 $(AM_CFLAGS) - -pm2_vid_la_SOURCES = pm2_vid.c -pm2_vid_la_LDFLAGS = -avoid-version -module - -pm3_vid_la_SOURCES = pm3_vid.c -pm3_vid_la_LDFLAGS = -avoid-version -module +cyberblade_vid_la_SOURCES = cyberblade_vid.c mach64_vid_la_SOURCES = mach64_vid.c -mach64_vid_la_LDFLAGS = -avoid-version -module + +mga_crtc2_vid_la_SOURCES = mga_vid.c +mga_crtc2_vid_la_LIBADD = -lm +mga_crtc2_vid_la_CPPFLAGS = $(AM_CPPFLAGS) -DCRTC2 mga_vid_la_SOURCES = mga_vid.c -mga_vid_la_LDFLAGS = -avoid-version -module -lm +mga_vid_la_LIBADD = -lm -mga_crtc2_vid_la_SOURCES = mga_vid.c -mga_crtc2_vid_la_LDFLAGS = -avoid-version -module -lm -mga_crtc2_vid_la_CFLAGS = -DCRTC2 $(AM_CFLAGS) +nvidia_vid_la_SOURCES = nvidia_vid.c -cyberblade_vid_la_SOURCES = cyberblade_vid.c -cyberblade_vid_la_LDFLAGS = -avoid-version -module +pm2_vid_la_SOURCES = pm2_vid.c -unichrome_vid_la_SOURCES = unichrome_vid.c -unichrome_vid_la_LDFLAGS = -avoid-version -module +pm3_vid_la_SOURCES = pm3_vid.c -nvidia_vid_la_SOURCES = nvidia_vid.c -nvidia_vid_la_LDFLAGS = -avoid-version -module +radeon_vid_la_SOURCES = radeon_vid.c +radeon_vid_la_LIBADD = -lm -sis_vid_la_SOURCES = sis_vid.c sis_bridge.c -sis_vid_la_LDFLAGS = -avoid-version -module +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_LDFLAGS = -avoid-version -module -lm +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 -AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \ - -I$(top_srcdir)/src/video_out/libdha \ - -I$(top_builddir)/src/video_out/libdha +unichrome_vid_la_SOURCES = unichrome_vid.c |