summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/audio_out/Makefile.am22
-rw-r--r--src/combined/Makefile.am4
-rw-r--r--src/demuxers/Makefile.am4
-rw-r--r--src/dxr3/Makefile.am4
-rw-r--r--src/input/Makefile.am10
-rw-r--r--src/input/vcd/Makefile.am4
-rw-r--r--src/libffmpeg/Makefile.am33
-rw-r--r--src/libmad/Makefile.am4
-rw-r--r--src/libspudec/Makefile.am2
-rw-r--r--src/libw32dll/DirectShow/Makefile.am2
-rw-r--r--src/libw32dll/Makefile.am7
-rw-r--r--src/libw32dll/dmo/Makefile.am2
-rw-r--r--src/libw32dll/wine/Makefile.am2
-rw-r--r--src/libxineadec/Makefile.am8
-rw-r--r--src/libxinevdec/Makefile.am6
-rw-r--r--src/post/planar/Makefile.am2
-rw-r--r--src/video_out/Makefile.am34
-rw-r--r--src/video_out/libdha/Makefile.am2
-rw-r--r--src/video_out/vidix/drivers/Makefile.am2
19 files changed, 74 insertions, 80 deletions
diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am
index a9d88ad8e..8759b123f 100644
--- a/src/audio_out/Makefile.am
+++ b/src/audio_out/Makefile.am
@@ -12,48 +12,48 @@ AM_LDFLAGS = $(xineplug_ldflags)
EXTRA_DIST = audio_irixal_out.c
-if HAVE_OSS
+if ENABLE_OSS
oss_module = xineplug_ao_out_oss.la
endif
-if HAVE_ALSA
+if ENABLE_ALSA
alsa_module = xineplug_ao_out_alsa.la
endif
-if HAVE_ESD
+if ENABLE_ESD
esd_module = xineplug_ao_out_esd.la
endif
-if HAVE_SUNAUDIO
+if ENABLE_SUNAUDIO
sun_module = xineplug_ao_out_sun.la
endif
-#if HAVE_IRIXAL
+#if ENABLE_IRIXAL
#irixal_module = xineplug_ao_out_irixal.la
#endif
-if HAVE_ARTS
+if ENABLE_ARTS
arts_module = xineplug_ao_out_arts.la
endif
-if HAVE_DIRECTX
+if ENABLE_DIRECTX
directx_module = xineplug_ao_out_directx.la
directx2_module = xineplug_ao_out_directx2.la
endif
-if HAVE_COREAUDIO
+if ENABLE_COREAUDIO
coreaudio_module = xineplug_ao_out_coreaudio.la
endif
-if HAVE_PULSEAUDIO
+if ENABLE_PULSEAUDIO
pulseaudio_module = xineplug_ao_out_pulseaudio.la
endif
-if HAVE_FUSIONSOUND
+if ENABLE_FUSIONSOUND
fusionsound_module = xineplug_ao_out_fusionsound.la
endif
-if HAVE_JACK
+if ENABLE_JACK
jack_module = xineplug_ao_out_jack.la
endif
diff --git a/src/combined/Makefile.am b/src/combined/Makefile.am
index 26277f99b..ed513cd4d 100644
--- a/src/combined/Makefile.am
+++ b/src/combined/Makefile.am
@@ -3,11 +3,11 @@ include $(top_srcdir)/misc/Makefile.common
AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
AM_LDFLAGS = $(xineplug_ldflags)
-if HAVE_WAVPACK
+if ENABLE_WAVPACK
xineplug_wavpack = xineplug_wavpack.la
endif
-if HAVE_LIBFLAC
+if ENABLE_LIBFLAC
xineplug_flac = xineplug_flac.la
endif
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am
index 9d8fc5ff1..0cfec1e89 100644
--- a/src/demuxers/Makefile.am
+++ b/src/demuxers/Makefile.am
@@ -12,7 +12,7 @@ xineinclude_HEADERS = demux.h
noinst_HEADERS = asfheader.h qtpalette.h group_games.h group_audio.h id3.h ebml.h matroska.h iff.h flacutils.h
-if HAVE_VORBIS
+if ENABLE_VORBIS
ogg_module = xineplug_dmx_ogg.la
endif
@@ -20,7 +20,7 @@ if BUILD_ASF
asf_module = xineplug_dmx_asf.la
endif
-if HAVE_LIBMNG
+if ENABLE_MNG
mng_module = xineplug_dmx_mng.la
endif
diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am
index dc1f26743..26743d43c 100644
--- a/src/dxr3/Makefile.am
+++ b/src/dxr3/Makefile.am
@@ -18,7 +18,7 @@ endif
noinst_HEADERS = em8300.h dxr3.h dxr3_scr.h video_out_dxr3.h
-if HAVE_DXR3
+if ENABLE_DXR3
xineplug_LTLIBRARIES = xineplug_decode_dxr3_video.la \
xineplug_decode_dxr3_spu.la \
xineplug_vo_out_dxr3.la
@@ -27,7 +27,7 @@ endif
xineplug_decode_dxr3_video_la_SOURCES = dxr3_decode_video.c
xineplug_decode_dxr3_video_la_LIBADD = $(XINE_LIB)
-if HAVE_DVDNAV
+if WITH_EXTERNAL_DVDNAV
xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c
xineplug_decode_dxr3_spu_la_LIBADD = $(XINE_LIB) $(DVDNAV_LIBS)
xineplug_decode_dxr3_spu_la_CFLAGS = $(AM_CFLAGS) $(DVDNAV_CFLAGS)
diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index b5aa3f902..a5c98c85f 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -14,7 +14,7 @@ SUBDIRS = dvb libreal librtsp
if ENABLE_VCD
SUBDIRS += vcd
endif
-if !HAVE_DVDNAV
+if !WITH_EXTERNAL_DVDNAV
SUBDIRS += libdvdnav
endif
@@ -27,20 +27,20 @@ if ENABLE_VCD
in_vcd = xineplug_inp_vcdo.la
endif
-if HAVE_V4L
+if ENABLE_V4L
in_v4l = xineplug_inp_v4l.la
in_pvr = xineplug_inp_pvr.la
endif
-if HAVE_GNOME_VFS
+if ENABLE_GNOME_VFS
in_gnome_vfs = xineplug_inp_gnome_vfs.la
endif
-if HAVE_LIBSMBCLIENT
+if ENABLE_LIBSMBCLIENT
in_smb = xineplug_inp_smb.la
endif
-if HAVE_DVDNAV
+if WITH_EXTERNAL_DVDNAV
DVD_CFLAGS = $(DVDNAV_CFLAGS)
link_dvdnav = $(DVDNAV_LIBS)
else
diff --git a/src/input/vcd/Makefile.am b/src/input/vcd/Makefile.am
index 28f6290fd..0ff664605 100644
--- a/src/input/vcd/Makefile.am
+++ b/src/input/vcd/Makefile.am
@@ -4,7 +4,7 @@ AM_CFLAGS = $(DEFAULT_OCFLAGS) $(LIBCDIO_CFLAGS) $(LIBVCD_CFLAGS)
AM_LDFLAGS = $(xineplug_ldflags)
SUBDIRS =
-if !HAVE_VCDNAV
+if !WITH_EXTERNAL_VCDLIBS
SUBDIRS += libcdio libvcd
endif
@@ -14,7 +14,7 @@ xineplug_LTLIBRARIES = xineplug_inp_vcd.la
xineplug_inp_vcd_la_SOURCES = xineplug_inp_vcd.c vcdplayer.c vcdio.c xine-extra.c
-if HAVE_VCDNAV
+if WITH_EXTERNAL_VCDLIBS
xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCDINFO_LIBS)
else
xineplug_inp_vcd_la_LIBADD = $(XINE_LIB) $(LIBVCD_LIBS) $(LIBVCDINFO_LIBS) -lm
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am
index b2571a4ea..ab866706c 100644
--- a/src/libffmpeg/Makefile.am
+++ b/src/libffmpeg/Makefile.am
@@ -1,21 +1,19 @@
include $(top_srcdir)/misc/Makefile.common
-AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
-AM_CPPFLAGS = $(ff_cppflags) $(ZLIB_CPPFLAGS)
-AM_LDFLAGS = $(xineplug_ldflags)
+AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
+AM_CPPFLAGS = $(ZLIB_CPPFLAGS)
+AM_LDFLAGS = $(xineplug_ldflags)
-if HAVE_FFMPEG
-AM_CFLAGS += $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS)
+if WITH_EXTERNAL_FFMPEG
+AM_CFLAGS += $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS)
link_ffmpeg = $(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS)
-
else
-ff_cppflags = -I$(top_srcdir)/contrib/ffmpeg/libavutil \
+AM_CPPFLAGS += -I$(top_srcdir)/contrib/ffmpeg/libavutil \
-I$(top_srcdir)/contrib/ffmpeg/libavcodec \
-I$(top_srcdir)/contrib/ffmpeg/libpostproc
-link_ffmpeg = \
- $(top_builddir)/contrib/ffmpeg/libavcodec/libavcodec.a \
- $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a \
- $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a
+link_ffmpeg = $(top_builddir)/contrib/ffmpeg/libavcodec/libavcodec.a \
+ $(top_builddir)/contrib/ffmpeg/libavutil/libavutil.a \
+ $(top_builddir)/contrib/ffmpeg/libpostproc/libpostproc.a
$(top_builddir)/contrib/ffmpeg/libavcodec/libavcodec.a:
$(MAKE) -C $(top_builddir)/contrib/ ffmpeg/libavcodec/libavcodec.a
@@ -33,7 +31,7 @@ ffmpeg_config.h: $(top_builddir)/contrib/ffmpeg/config.h
cp $(top_builddir)/contrib/ffmpeg/config.h ffmpeg_config.h
BUILT_SOURCES = ffmpeg_config.h
-CLEANFILES = $(BUILT_SOURCES)
+CLEANFILES = $(BUILT_SOURCES)
endif
@@ -42,8 +40,9 @@ EXTRA_DIST = ffmpeg_encoder.c
xineplug_LTLIBRARIES = xineplug_decode_ff.la xineplug_decode_dvaudio.la
-if HAVE_DXR3
-AM_CPPFLAGS += -I$(top_srcdir)/src/dxr3 $(X_CFLAGS)
+if ENABLE_DXR3
+AM_CFLAGS += $(X_CFLAGS)
+AM_CPPFLAGS += -I$(top_srcdir)/src/dxr3
xineplug_decode_ff_la_SOURCES = ffmpeg_decoder.c ff_audio_decoder.c ff_video_decoder.c \
ffmpeg_encoder.c ff_mpeg_parser.c ffmpeg_decoder.h \
ff_mpeg_parser.h
@@ -54,10 +53,10 @@ endif
nodist_xineplug_decode_ff_la_SOURCES = ffmpeg_config.h
-xineplug_decode_ff_la_LDFLAGS = $(AM_LDFLAGS) $(IMPURE_TEXT_LDFLAGS)
xineplug_decode_ff_la_LIBADD = $(MLIB_LIBS) $(XINE_LIB) -lm $(ZLIB_LIBS) \
$(link_ffmpeg) $(PTHREAD_LIBS)
+xineplug_decode_ff_la_LDFLAGS = $(AM_LDFLAGS) $(IMPURE_TEXT_LDFLAGS)
+xineplug_decode_dvaudio_la_SOURCES = ff_dvaudio_decoder.c
+xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB)
xineplug_decode_dvaudio_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/contrib/ffmpeg/libavcodec
-xineplug_decode_dvaudio_la_SOURCES = ff_dvaudio_decoder.c
-xineplug_decode_dvaudio_la_LIBADD = $(XINE_LIB)
diff --git a/src/libmad/Makefile.am b/src/libmad/Makefile.am
index b1e1f29f5..482d68bb3 100644
--- a/src/libmad/Makefile.am
+++ b/src/libmad/Makefile.am
@@ -24,11 +24,11 @@ noinst_HEADERS = \
timer.h \
version.h
-if MAD
+if ENABLE_MAD
xineplug_LTLIBRARIES = xineplug_decode_mad.la
endif
-if EXTERNAL_LIBMAD
+if WITH_EXTERNAL_MAD
internal_sources =
external_libs = $(LIBMAD_LIBS)
else
diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am
index 13d5da6f5..62de3774d 100644
--- a/src/libspudec/Makefile.am
+++ b/src/libspudec/Makefile.am
@@ -8,7 +8,7 @@ noinst_HEADERS = spu.h
xineplug_LTLIBRARIES = xineplug_decode_spu.la
-if HAVE_DVDNAV
+if WITH_EXTERNAL_DVDNAV
external_dvdnav_libs = $(DVDNAV_LIBS)
internal_dvdnav_sources =
else
diff --git a/src/libw32dll/DirectShow/Makefile.am b/src/libw32dll/DirectShow/Makefile.am
index 414e6764f..02eddc00a 100644
--- a/src/libw32dll/DirectShow/Makefile.am
+++ b/src/libw32dll/DirectShow/Makefile.am
@@ -16,9 +16,7 @@ noinst_HEADERS = \
DS_Filter.h \
DS_VideoDecoder.h
-if HAVE_W32DLL
noinst_LTLIBRARIES = libds_filter.la
-endif
libds_filter_la_SOURCES = \
allocator.c \
diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am
index 94dae4ab9..7d11bb2dc 100644
--- a/src/libw32dll/Makefile.am
+++ b/src/libw32dll/Makefile.am
@@ -4,13 +4,16 @@ AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG)
AM_CPPFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"$(w32_path)\"
AM_LDFLAGS = $(xineplug_ldflags)
-SUBDIRS = wine DirectShow dmo qtx
+SUBDIRS =
+if ENABLE_W32DLL
+SUBDIRS += wine DirectShow dmo qtx
+endif
EXTRA_DIST = common.c
noinst_HEADERS = libwin32.h w32codec.h
-if HAVE_W32DLL
+if ENABLE_W32DLL
xineplug_LTLIBRARIES = xineplug_decode_w32dll.la xineplug_decode_qt.la
endif
diff --git a/src/libw32dll/dmo/Makefile.am b/src/libw32dll/dmo/Makefile.am
index 663e179a9..56bfc8f34 100644
--- a/src/libw32dll/dmo/Makefile.am
+++ b/src/libw32dll/dmo/Makefile.am
@@ -12,9 +12,7 @@ noinst_HEADERS = \
dmo.h \
DMO_VideoDecoder.h
-if HAVE_W32DLL
noinst_LTLIBRARIES = libdmo_filter.la
-endif
libdmo_filter_la_SOURCES = \
buffer.c \
diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am
index b9a28a151..1756e3262 100644
--- a/src/libw32dll/wine/Makefile.am
+++ b/src/libw32dll/wine/Makefile.am
@@ -47,9 +47,7 @@ noinst_HEADERS = \
winuser.h \
wrapper.h
-if HAVE_W32DLL
noinst_LTLIBRARIES = libwine.la
-endif
libwine_la_SOURCES = \
afl.c \
diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am
index e65024184..474dda1a1 100644
--- a/src/libxineadec/Makefile.am
+++ b/src/libxineadec/Makefile.am
@@ -7,19 +7,19 @@ SUBDIRS = gsm610 nosefart
EXTRA_DIST = fooaudio.c
-if HAVE_VORBIS
+if ENABLE_VORBIS
vorbis_module = xineplug_decode_vorbis.la
endif
-if HAVE_SPEEX
+if ENABLE_SPEEX
speex_module = xineplug_decode_speex.la
endif
-if MUSEPACK
+if ENABLE_MUSEPACK
musepack_module = xineplug_decode_mpc.la
endif
-if DTS
+if ENABLE_DTS
dts_module = xineplug_decode_dts.la
endif
diff --git a/src/libxinevdec/Makefile.am b/src/libxinevdec/Makefile.am
index 2902d23b3..28a926a79 100644
--- a/src/libxinevdec/Makefile.am
+++ b/src/libxinevdec/Makefile.am
@@ -5,15 +5,15 @@ AM_LDFLAGS = $(xineplug_ldflags)
EXTRA_DIST = foovideo.c
-if HAVE_WAND
+if ENABLE_IMAGEMAGICK
image_module = xineplug_decode_image.la
endif
-if HAVE_GDK_PIXBUF
+if ENABLE_GDK_PIXBUF
gdkpixbuf_module = xineplug_decode_gdk_pixbuf.la
endif
-if HAVE_THEORA
+if ENABLE_THEORA
theora_module = xineplug_decode_theora.la
endif
diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am
index 609fd7f0f..44f09c6b6 100644
--- a/src/post/planar/Makefile.am
+++ b/src/post/planar/Makefile.am
@@ -6,7 +6,7 @@ AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) $(ff_cflags) -fomit-frame-po
AM_CPPFLAGS =
AM_LDFLAGS = $(xineplug_ldflags) $(IMPURE_TEXT_LDFLAGS)
-if HAVE_FFMPEG
+if WITH_EXTERNAL_FFMPEG
postproc_lib = $(FFMPEG_POSTPROC_LIBS)
ff_cflags = $(FFMPEG_POSTPROC_CFLAGS)
else
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index efea3f3b7..a37eae3eb 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -11,14 +11,14 @@ SUBDIRS += libdha
endif
# vidix depends on portions of dha
-if HAVE_VIDIX
+if ENABLE_VIDIX
if !BUILD_DHA_KMOD
SUBDIRS += libdha
endif
SUBDIRS += vidix
endif
-if HAVE_MACOSX_VIDEO
+if ENABLE_MACOSX_VIDEO
SUBDIRS += macosx
endif
@@ -41,63 +41,63 @@ endif
if HAVE_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
diff --git a/src/video_out/libdha/Makefile.am b/src/video_out/libdha/Makefile.am
index de63444c0..05aebb704 100644
--- a/src/video_out/libdha/Makefile.am
+++ b/src/video_out/libdha/Makefile.am
@@ -15,7 +15,7 @@ CLEANFILES = $(awk_generated)
noinst_HEADERS = AsmMacros.h libdha.h pci_ids.h pci_names.h pci_vendors.h
-if HAVE_VIDIX
+if ENABLE_VIDIX
noinst_LTLIBRARIES = libdha.la
endif
diff --git a/src/video_out/vidix/drivers/Makefile.am b/src/video_out/vidix/drivers/Makefile.am
index 1ad68da26..db3adc078 100644
--- a/src/video_out/vidix/drivers/Makefile.am
+++ b/src/video_out/vidix/drivers/Makefile.am
@@ -10,7 +10,6 @@ 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_LTLIBRARIES = \
mach64_vid.la \
mga_crtc2_vid.la \
@@ -24,7 +23,6 @@ vidix_LTLIBRARIES = \
nvidia_vid.la \
sis_vid.la \
savage_vid.la
-endif
cyberblade_vid_la_SOURCES = cyberblade_vid.c
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-23 08:13:19 +0000