diff options
Diffstat (limited to 'src')
40 files changed, 548 insertions, 179 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 0baa614e9..66742e03c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,9 +1,29 @@ - -SUBDIRS = xine-utils xine-engine audio_out video_out dxr3 input libmpeg2 libspudec demuxers \ - liba52 libffmpeg liblpcm libw32dll libmad libdts \ - libvorbis libdivx4 libsputext libspucc libxvid libxinevdec \ - libxineadec libfaad - +# Order is important be careful changing SUBDIRS +SUBDIRS = \ + xine-utils \ + xine-engine \ + audio_out \ + video_out \ + dxr3 \ + input \ + libmpeg2 \ + libspudec \ + demuxers \ + liba52 \ + libffmpeg \ + liblpcm \ + libw32dll \ + libmad \ + libdts \ + libvorbis \ + libdivx4 \ + libsputext \ + libspucc \ + libxvid \ + libxinevdec \ + libxineadec \ + libfaad + debug: @list='$(SUBDIRS)'; for subdir in $$list; do \ (cd $$subdir && $(MAKE) $@) || exit; \ @@ -23,3 +43,4 @@ maintainer-clean-generic: -@echo "it deletes files that may require special tools to rebuild." -rm -f Makefile.in + diff --git a/src/audio_out/Makefile.am b/src/audio_out/Makefile.am index e40f2485e..3c535a7ae 100644 --- a/src/audio_out/Makefile.am +++ b/src/audio_out/Makefile.am @@ -1,7 +1,10 @@ -CFLAGS = @CFLAGS@ -DXINE_COMPILE $(ALSA_CFLAGS) $(ESD_CFLAGS) $(IRIXAL_CFLAGS) $(ARTS_CFLAGS) +AM_CFLAGS = @CFLAGS@ -DXINE_COMPILE $(ALSA_CFLAGS) $(ESD_CFLAGS) $(IRIXAL_CFLAGS) $(ARTS_CFLAGS) -EXTRA_DIST = audio_alsa_out.c audio_esd_out.c \ - audio_sun_out.c audio_arts_out.c audio_irixal_out.c +EXTRA_DIST = audio_alsa_out.c \ + audio_arts_out.c \ + audio_esd_out.c \ + audio_irixal_out.c \ + audio_sun_out.c LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic @@ -42,8 +45,13 @@ endif #lib_LTLIBRARIES = $(oss_module) $(alsa_module) $(sun_module) \ # $(arts_module) $(esd_module) -lib_LTLIBRARIES = $(oss_module) $(alsa_module) $(esd_module) $(sun_module) $(arts_module) \ - $(irixal_module) +lib_LTLIBRARIES = \ + $(alsa_module) \ + $(arts_module) \ + $(esd_module) \ + $(irixal_module) \ + $(oss_module) \ + $(sun_module) xineplug_ao_out_oss_la_SOURCES = audio_oss_out.c xineplug_ao_out_oss_la_LDFLAGS = -avoid-version -module @@ -68,8 +76,13 @@ xineplug_ao_out_arts_la_SOURCES = audio_arts_out.c xineplug_ao_out_arts_la_LIBADD = $(ARTS_LIBS) xineplug_ao_out_arts_la_LDFLAGS = -avoid-version -module -noinst_HEADERS = audio_oss_out.h audio_alsa_out.h audio_esd_out.h \ - audio_sun_out.h audio_arts_out.h audio_irixal_out.h +noinst_HEADERS = \ + audio_alsa_out.h \ + audio_arts_out.h \ + audio_esd_out.h \ + audio_irixal_out.h \ + audio_oss_out.h \ + audio_sun_out.h debug: @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index 99c5375a4..0cabddebd 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -1,4 +1,4 @@ -CFLAGS = @CFLAGS@ $(OGG_CFLAGS) +AM_CFLAGS = @CFLAGS@ $(OGG_CFLAGS) LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index 6d75ccbcd..966048bc5 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -1,11 +1,13 @@ -CFLAGS = @CFLAGS@ $(X_CFLAGS) +AM_CFLAGS = @CFLAGS@ $(X_CFLAGS) LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic libdir = $(XINE_PLUGINDIR) if HAVE_DXR3 -dxr3_modules = xineplug_decode_dxr3_video.la xineplug_decode_dxr3_spu.la xineplug_vo_out_dxr3.la +dxr3_modules = xineplug_decode_dxr3_video.la \ + xineplug_decode_dxr3_spu.la \ + xineplug_vo_out_dxr3.la endif if HAVE_X11 link_x_libs = $(X_LIBS) -lXext @@ -27,12 +29,24 @@ xineplug_decode_dxr3_spu_la_SOURCES = dxr3_decode_spu.c nav_read.c xineplug_decode_dxr3_spu_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la xineplug_decode_dxr3_spu_la_LDFLAGS = -avoid-version -module -xineplug_vo_out_dxr3_la_SOURCES = video_out_dxr3.c dxr3_mpeg_encoders.c alphablend.c dxr3_spu_encoder.c +xineplug_vo_out_dxr3_la_SOURCES = \ + alphablend.c \ + dxr3_mpeg_encoders.c \ + dxr3_spu_encoder.c \ + video_out_dxr3.c + xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) \ $(top_builddir)/src/xine-utils/libxineutils.la xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module -noinst_HEADERS = dxr3.h dxr3_scr.h video_out_dxr3.h nav_types.h nav_read.h alphablend.h bswap.h +noinst_HEADERS = \ + alphablend.h \ + bswap.h \ + dxr3.h \ + dxr3_scr.h \ + nav_read.h \ + nav_types.h \ + video_out_dxr3.h debug: @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" diff --git a/src/input/Makefile.am b/src/input/Makefile.am index e9911576e..787c63f84 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -38,12 +38,20 @@ DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ link_dvdnav = libdvdnav/libdvdnav.la libdvdread/libdvdread.la endif -CFLAGS = @CFLAGS@ $(DVD_CFLAGS) +AM_CFLAGS = @CFLAGS@ $(DVD_CFLAGS) DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(DVD_CFLAGS) -lib_LTLIBRARIES = xineplug_inp_file.la $(in_dvd) $(in_vcd) $(in_cda) \ - xineplug_inp_stdin_fifo.la xineplug_inp_net.la \ - xineplug_inp_rtp.la xineplug_inp_http.la xineplug_inp_mms.la +lib_LTLIBRARIES = \ + $(in_cda) \ + $(in_dvd) \ + $(in_vcd) \ + xineplug_inp_file.la \ + xineplug_inp_http.la \ + xineplug_inp_mms.la \ + xineplug_inp_net.la \ + xineplug_inp_rtp.la \ + xineplug_inp_stdin_fifo.la + xineplug_inp_file_la_SOURCES = input_file.c xineplug_inp_file_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la diff --git a/src/input/libdvdnav/Makefile.am b/src/input/libdvdnav/Makefile.am index 4c0d5c229..e15771a77 100644 --- a/src/input/libdvdnav/Makefile.am +++ b/src/input/libdvdnav/Makefile.am @@ -1,18 +1,32 @@ DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \ -I$(top_srcdir)/src/input/libdvdread/ -CFLAGS = @CFLAGS@ $(DVD_CFLAGS) +AM_CFLAGS = @CFLAGS@ $(DVD_CFLAGS) noinst_LTLIBRARIES = libdvdnav.la -libdvdnav_la_SOURCES = decoder.c dvdnav.c vm.c vmcmd.c \ - read_cache.c navigation.c highlight.c \ - searching.c settings.c -libdvdnav_la_LDFLAGS = $(THREAD_LIBS) \ - -avoid-version -module - -noinst_HEADERS = decoder.h dvdnav.h dvdnav_events.h \ - dvdnav_internal.h vm.h vmcmd.h read_cache.h dvd_types.h +libdvdnav_la_SOURCES = \ + decoder.c \ + dvdnav.c \ + highlight.c \ + navigation.c \ + read_cache.c \ + searching.c \ + settings.c \ + vm.c \ + vmcmd.c + +libdvdnav_la_LDFLAGS = $(THREAD_LIBS) -avoid-version -module + +noinst_HEADERS = \ + decoder.h \ + dvdnav.h \ + dvdnav_events.h \ + dvdnav_internal.h \ + vm.h \ + vmcmd.h \ + read_cache.h \ + dvd_types.h debug: @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(DVD_CFLAGS)" diff --git a/src/input/libdvdread/Makefile.am b/src/input/libdvdread/Makefile.am index 1af16b768..590cf8030 100644 --- a/src/input/libdvdread/Makefile.am +++ b/src/input/libdvdread/Makefile.am @@ -1,16 +1,31 @@ DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -CFLAGS = @CFLAGS@ $(DVD_CFLAGS) +AM_CFLAGS = @CFLAGS@ $(DVD_CFLAGS) noinst_LTLIBRARIES = libdvdread.la -libdvdread_la_SOURCES = dvd_input.c dvd_reader.c dvd_udf.c ifo_read.c \ - ifo_print.c nav_read.c nav_print.c bswap.h dvd_udf.h dvd_input.h -libdvdread_la_LDFLAGS = $(THREAD_LIBS) \ - -avoid-version -module - -noinst_HEADERS = dvd_reader.h ifo_types.h ifo_read.h \ - ifo_print.h nav_types.h nav_read.h nav_print.h +libdvdread_la_SOURCES = \ + dvd_input.c \ + dvd_reader.c \ + dvd_udf.c \ + ifo_read.c \ + ifo_print.c \ + nav_read.c \ + nav_print.c + +libdvdread_la_LDFLAGS = $(THREAD_LIBS) -avoid-version -module + +noinst_HEADERS = \ + bswap.h \ + dvd_udf.h \ + dvd_input.h \ + dvd_reader.h \ + ifo_types.h \ + ifo_read.h \ + ifo_print.h \ + nav_types.h \ + nav_read.h \ + nav_print.h debug: @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS)" diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am index 2a5375560..f71d26f07 100644 --- a/src/liba52/Makefile.am +++ b/src/liba52/Makefile.am @@ -1,4 +1,4 @@ -CFLAGS = @CFLAGS@ $(LIBA52_CFLAGS) +AM_CFLAGS = @CFLAGS@ $(LIBA52_CFLAGS) DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(LIBA52_CFLAGS) @@ -8,13 +8,21 @@ libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_a52.la -xineplug_decode_a52_la_SOURCES = bitstream.c bit_allocate.c \ - parse.c downmix.c imdct.c \ +xineplug_decode_a52_la_SOURCES = \ + bitstream.c \ + bit_allocate.c \ + downmix.c \ + imdct.c \ + parse.c \ xine_decoder.c + xineplug_decode_a52_la_LDFLAGS = -avoid-version -module -noinst_HEADERS = a52.h a52_internal.h \ - bitstream.h tables.h +noinst_HEADERS = \ + a52.h \ + a52_internal.h \ + bitstream.h \ + tables.h ## ## Install header files (default=$includedir/xine) diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am index 98053ea21..24c816bb1 100644 --- a/src/libfaad/Makefile.am +++ b/src/libfaad/Makefile.am @@ -16,20 +16,75 @@ lib_LTLIBRARIES = $(faad_module) VPATH = @srcdir@:@srcdir@/codebook: -xineplug_decode_faad_la_SOURCES = xine_decoder.c \ - bits.c data.c decoder.c drc.c error.c filtbank.c rvlc_scale_factors.c \ - ic_predict.c is.c lt_predict.c mdct.c mp4.c ms.c output.c pns.c \ - pulse.c specrec.c syntax.c tns.c reordered_spectral_data.c cfft.c \ - hcb_1.c hcb_2.c hcb_3.c hcb_4.c hcb_5.c hcb_6.c hcb_7.c hcb_8.c \ - hcb_9.c hcb_10.c hcb_11.c hcb_sf.c +xineplug_decode_faad_la_SOURCES = \ + bits.c \ + cfft.c \ + data.c \ + decoder.c \ + drc.c \ + error.c \ + filtbank.c \ + codebook/hcb_1.c \ + codebook/hcb_2.c \ + codebook/hcb_3.c \ + codebook/hcb_4.c \ + codebook/hcb_5.c \ + codebook/hcb_6.c \ + codebook/hcb_7.c \ + codebook/hcb_8.c \ + codebook/hcb_9.c \ + codebook/hcb_10.c \ + codebook/hcb_11.c \ + codebook/hcb_sf.c \ + ic_predict.c \ + is.c \ + lt_predict.c \ + mdct.c \ + mp4.c \ + ms.c \ + output.c \ + pns.c \ + pulse.c \ + reordered_spectral_data.c \ + rvlc_scale_factors.c \ + specrec.c \ + syntax.c \ + tns.c \ + xine_decoder.c + xineplug_decode_faad_la_LDFLAGS = -avoid-version -module -xineplug_decode_faad_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la +xineplug_decode_faad_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la -noinst_HEADERS = analysis.h bits.h common.h data.h decoder.h drc.h error.h \ - filtbank.h huffman.h ic_predict.h is.h kbd_win.h cfft.h \ - lt_predict.h mdct.h mp4.h ms.h output.h pns.h pulse.h \ - sbr_dec.h sbr_huff.h sbr_qmf.h sbr_syntax.h rvlc_scale_factors.h \ - specrec.h syntax.h tns.h codebook/hcb.h faad.h +noinst_HEADERS = \ + analysis.h \ + bits.h \ + cfft.h \ + common.h \ + data.h \ + decoder.h \ + drc.h \ + error.h \ + faad.h \ + filtbank.h \ + huffman.h \ + ic_predict.h \ + is.h \ + kbd_win.h \ + lt_predict.h \ + mdct.h \ + mp4.h \ + ms.h \ + output.h \ + pns.h \ + pulse.h \ + rvlc_scale_factors.h \ + sbr_dec.h \ + sbr_huff.h \ + sbr_qmf.h \ + sbr_syntax.h \ + specrec.h \ + syntax.h \ + tns.h debug: @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" diff --git a/src/libfaad/codebook/Makefile.am b/src/libfaad/codebook/Makefile.am index 5dfd923d0..af2e85b18 100644 --- a/src/libfaad/codebook/Makefile.am +++ b/src/libfaad/codebook/Makefile.am @@ -1,5 +1,16 @@ -EXTRA_DIST = hcb.h hcb_1.c hcb_2.c hcb_3.c hcb_4.c hcb_5.c hcb_6.c hcb_7.c hcb_8.c hcb_9.c \ - hcb_10.c hcb_11.c hcb_sf.c +EXTRA_DIST = hcb.h \ + hcb_1.c \ + hcb_2.c \ + hcb_3.c \ + hcb_4.c \ + hcb_5.c \ + hcb_6.c \ + hcb_7.c \ + hcb_8.c \ + hcb_9.c \ + hcb_10.c \ + hcb_11.c \ + hcb_sf.c all: debug: diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am index fe6b04a02..41b11fd62 100644 --- a/src/libffmpeg/libavcodec/Makefile.am +++ b/src/libffmpeg/libavcodec/Makefile.am @@ -8,30 +8,55 @@ EXTRA_DIST = fdctref.c imgresample.c #CFLAGS = -D_FILE_OFFSET_BITS=64 @CFLAGS@ -CFLAGS = @CFLAGS@ $(LIBFFMPEG_CFLAGS) +AM_CFLAGS = @CFLAGS@ $(LIBFFMPEG_CFLAGS) ASFLAGS = LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic noinst_LTLIBRARIES = libavcodec.la -libavcodec_la_SOURCES = common.c utils.c mpegvideo.c h263.c jrevdct.c jfdctfst.c \ - mjpeg.c dsputil.c svq1.c jfdctint.c \ - motion_est.c imgconvert.c msmpeg4.c \ - mpeg12.c h263dec.c rv10.c simple_idct.c \ - ratecontrol.c mem.c eval.c +libavcodec_la_SOURCES = \ + common.c \ + dsputil.c \ + eval.c \ + h263.c \ + h263dec.c \ + imgconvert.c \ + jfdctfst.c \ + jfdctint.c \ + jrevdct.c \ + mem.c \ + mjpeg.c \ + motion_est.c \ + mpeg12.c + mpegvideo.c \ + msmpeg4.c \ + ratecontrol.c \ + rv10.c \ + simple_idct.c \ + svq1.c \ + utils.c #imgresample.c libavcodec_la_LDFLAGS = \ - $(top_builddir)/src/libffmpeg/libavcodec/armv4l/libavcodec_armv4l.la \ - $(top_builddir)/src/libffmpeg/libavcodec/i386/libavcodec_mmx.la \ - $(top_builddir)/src/libffmpeg/libavcodec/mlib/libavcodec_mlib.la \ - -avoid-version -module + $(top_builddir)/src/libffmpeg/libavcodec/armv4l/libavcodec_armv4l.la \ + $(top_builddir)/src/libffmpeg/libavcodec/i386/libavcodec_mmx.la \ + $(top_builddir)/src/libffmpeg/libavcodec/mlib/libavcodec_mlib.la \ + -avoid-version -module -noinst_HEADERS = avcodec.h dsputil.h mpegvideo.h \ - common.h h263data.h mpeg4data.h msmpeg4data.h \ - mpeg12data.h simple_idct.h mangle.h svq1_cb.h +noinst_HEADERS = \ + avcodec.h \ + common.h \ + dsputil.h \ + h263data.h \ + mangle.h \ + mpeg4data.h \ + mpeg12data.h \ + mpegvideo.h \ + msmpeg4data.h \ + simple_idct.h \ + svq1_cb.h .s.lo: $(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$< diff --git a/src/libffmpeg/libavcodec/alpha/Makefile.am b/src/libffmpeg/libavcodec/alpha/Makefile.am index 5512f285e..84ddab118 100644 --- a/src/libffmpeg/libavcodec/alpha/Makefile.am +++ b/src/libffmpeg/libavcodec/alpha/Makefile.am @@ -1,4 +1,8 @@ -EXTRA_DIST = asm.h dsputil_alpha.c mpegvideo_alpha.c pixops.h motion_est_alpha.c +EXTRA_DIST = asm.h \ + dsputil_alpha.c \ + mpegvideo_alpha.c \ + pixops.h \ + motion_est_alpha.c all: debug: diff --git a/src/libffmpeg/libavcodec/armv4l/Makefile.am b/src/libffmpeg/libavcodec/armv4l/Makefile.am index eb7470eeb..0cff3a2a4 100644 --- a/src/libffmpeg/libavcodec/armv4l/Makefile.am +++ b/src/libffmpeg/libavcodec/armv4l/Makefile.am @@ -4,14 +4,14 @@ #CFLAGS = @CFLAGS@ @LIBFFMPEG_CFLAGS@ -CFLAGS = -O2 $(LIBFFMPEG_CFLAGS) +AM_CFLAGS = -O2 $(LIBFFMPEG_CFLAGS) ASFLAGS = LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic noinst_LTLIBRARIES = libavcodec_armv4l.la -libavcodec_armv4l_src = jrevdct_arm.S dsputil_arm.c +libavcodec_armv4l_src = dsputil_arm.c jrevdct_arm.S libavcodec_armv4l_dummy = libavcodec_armv4l_dummy.c EXTRA_DIST = $(libavcodec_armv4l_src) $(libavcodec_armv4l_dummy) diff --git a/src/libffmpeg/libavcodec/i386/Makefile.am b/src/libffmpeg/libavcodec/i386/Makefile.am index f960f8417..1d36c1da8 100644 --- a/src/libffmpeg/libavcodec/i386/Makefile.am +++ b/src/libffmpeg/libavcodec/i386/Makefile.am @@ -6,7 +6,7 @@ # we must not use CFLAGS here, gcc optimizations produce # bad code if we do so. -CFLAGS = -O2 $(LIBFFMPEG_CFLAGS) +AM_CFLAGS = -O2 $(LIBFFMPEG_CFLAGS) ASFLAGS = @@ -14,13 +14,20 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic noinst_LTLIBRARIES = libavcodec_mmx.la -libavcodec_mmx_src = fdct_mmx.c \ - dsputil_mmx.c mpegvideo_mmx.c \ - idct_mmx.c motion_est_mmx.c \ - simple_idct_mmx.c +libavcodec_mmx_src = \ + dsputil_mmx.c \ + fdct_mmx.c \ + idct_mmx.c \ + motion_est_mmx.c \ + mpegvideo_mmx.c \ + simple_idct_mmx.c + libavcodec_mmx_dummy = libavcodec_mmx_dummy.c -EXTRA_DIST = $(libavcodec_mmx_src) $(libavcodec_mmx_dummy) mpegvideo_mmx_template.c +EXTRA_DIST = \ + $(libavcodec_mmx_dummy) \ + $(libavcodec_mmx_src) \ + mpegvideo_mmx_template.c if HAVE_FFMMX mmx_modules = $(libavcodec_mmx_src) diff --git a/src/libffmpeg/libavcodec/i386/fdct_mmx.c b/src/libffmpeg/libavcodec/i386/fdct_mmx.c index 73b63ac63..abc5abeaa 100644 --- a/src/libffmpeg/libavcodec/i386/fdct_mmx.c +++ b/src/libffmpeg/libavcodec/i386/fdct_mmx.c @@ -10,7 +10,7 @@ #include "../common.h" #include "mmx.h" -#define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align))) +//#define ATTR_ALIGN(align) __attribute__ ((__aligned__ (align))) ////////////////////////////////////////////////////////////////////// // diff --git a/src/libffmpeg/libavcodec/mlib/Makefile.am b/src/libffmpeg/libavcodec/mlib/Makefile.am index 0270fe107..68311e35c 100644 --- a/src/libffmpeg/libavcodec/mlib/Makefile.am +++ b/src/libffmpeg/libavcodec/mlib/Makefile.am @@ -4,7 +4,7 @@ #CFLAGS = -D_FILE_OFFSET_BITS=64 @CFLAGS@ -CFLAGS = @CFLAGS@ $(LIBFFMPEG_CFLAGS) +AM_CFLAGS = @CFLAGS@ $(LIBFFMPEG_CFLAGS) ASFLAGS = LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic diff --git a/src/libmad/Makefile.am b/src/libmad/Makefile.am index e2b0c642d..c5e88383f 100644 --- a/src/libmad/Makefile.am +++ b/src/libmad/Makefile.am @@ -8,16 +8,38 @@ libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_mad.la -xineplug_decode_mad_la_SOURCES = bit.c frame.c layer3.c timer.c \ - huffman.c stream.c fixed.c layer12.c synth.c version.c \ +xineplug_decode_mad_la_SOURCES = \ + bit.c \ + fixed.c \ + frame.c \ + huffman.c \ + layer12.c \ + layer3.c \ + stream.c \ + synth.c \ + timer.c \ + version.c \ xine_decoder.c - xineplug_decode_mad_la_LDFLAGS = -avoid-version -module -noinst_HEADERS = D.dat huffman.h stream.h fixed.h \ - imdct_s.dat qc_table.dat synth.h bit.h frame.h layer12.h \ - rq_table.dat timer.h global.h layer3.h sf_table.dat version.h +noinst_HEADERS = \ + D.dat \ + imdct_s.dat \ + qc_table.dat \ + rq_table.dat \ + sf_table.dat \ + bit.h \ + fixed.h \ + frame.h \ + global.h \ + huffman.h \ + layer12.h \ + layer3.h \ + stream.h \ + synth.h \ + timer.h \ + version.h ## diff --git a/src/libmpeg2/Makefile.am b/src/libmpeg2/Makefile.am index 28a727093..e091b833c 100644 --- a/src/libmpeg2/Makefile.am +++ b/src/libmpeg2/Makefile.am @@ -12,10 +12,22 @@ lib_LTLIBRARIES = xineplug_decode_mpeg2.la #libmpeg2_la_SOURCES = slice.c header.c stats.c idct.c motion_comp.c\ # decode.c idct_mmx.c motion_comp_mmx.c -xineplug_decode_mpeg2_la_SOURCES = slice.c header.c stats.c idct.c \ - motion_comp.c decode.c idct_mmx.c motion_comp_mmx.c \ - idct_mlib.c motion_comp_mlib.c idct_altivec.c \ - motion_comp_altivec.c cpu_state.c xine_decoder.c +xineplug_decode_mpeg2_la_SOURCES = \ + cpu_state.c \ + decode.c \ + header.c \ + idct.c \ + idct_altivec.c \ + idct_mlib.c \ + idct_mmx.c \ + motion_comp.c \ + motion_comp_altivec.c \ + motion_comp_mmx.c \ + motion_comp_mlib.c \ + slice.c \ + stats.c \ + xine_decoder.c + xineplug_decode_mpeg2_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la xineplug_decode_mpeg2_la_LDFLAGS = -avoid-version -module diff --git a/src/libmpg123/Makefile.am b/src/libmpg123/Makefile.am index dd4713e72..08d2d5522 100644 --- a/src/libmpg123/Makefile.am +++ b/src/libmpg123/Makefile.am @@ -4,8 +4,17 @@ libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_mpg123.la -xineplug_decode_mpg123_la_SOURCES = common.c decode_i386.c layer1.c layer3.c tabinit.c \ - dct64_i386.c interface.c layer2.c xine_decoder.c +xineplug_decode_mpg123_la_SOURCES = \ + common.c \ + dct64_i386.c \ + decode_i386.c \ + interface.c \ + layer1.c \ + layer2.c \ + layer3.c \ + tabinit.c \ + xine_decoder.c + xineplug_decode_mpg123_la_LDFLAGS = -avoid-version -module noinst_HEADERS = huffman.h mpg123.h mpglib.h l2tables.h diff --git a/src/libspucc/Makefile.am b/src/libspucc/Makefile.am index d90ae5aa2..17a8c0851 100644 --- a/src/libspucc/Makefile.am +++ b/src/libspucc/Makefile.am @@ -4,7 +4,7 @@ libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_spucc.la -xineplug_decode_spucc_la_SOURCES = xine_decoder.c cc_decoder.c +xineplug_decode_spucc_la_SOURCES = cc_decoder.c xine_decoder.c xineplug_decode_spucc_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la xineplug_decode_spucc_la_LDFLAGS = -avoid-version -module diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am index 796569eea..75a8a32f3 100644 --- a/src/libspudec/Makefile.am +++ b/src/libspudec/Makefile.am @@ -4,7 +4,12 @@ libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_spu.la -xineplug_decode_spu_la_SOURCES = spu.c xine_decoder.c nav_read.c nav_print.c +xineplug_decode_spu_la_SOURCES = \ + nav_read.c \ + nav_print.c \ + spu.c \ + xine_decoder.c + xineplug_decode_spu_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la xineplug_decode_spu_la_LDFLAGS = -avoid-version -module diff --git a/src/libvorbis/Makefile.am b/src/libvorbis/Makefile.am index 07da7bfce..2afa15af1 100644 --- a/src/libvorbis/Makefile.am +++ b/src/libvorbis/Makefile.am @@ -2,7 +2,7 @@ ## Process this file with automake to produce Makefile.in ## -CFLAGS = @CFLAGS@ $(VORBIS_CFLAGS) +AM_CFLAGS = @CFLAGS@ $(VORBIS_CFLAGS) LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic diff --git a/src/libw32dll/DirectShow/Makefile.am b/src/libw32dll/DirectShow/Makefile.am index 8af1aa4fb..6a6526639 100644 --- a/src/libw32dll/DirectShow/Makefile.am +++ b/src/libw32dll/DirectShow/Makefile.am @@ -15,12 +15,27 @@ endif noinst_LTLIBRARIES = $(ds_filter_lib) -libds_filter_la_SOURCES = guids.c inputpin.c outputpin.c allocator.c \ - cmediasample.c DS_Filter.c DS_AudioDecoder.c DS_VideoDecoder.c - -noinst_HEADERS = DS_Filter.h allocator.h cmediasample.h \ - guids.h inputpin.h interfaces.h iunk.h outputpin.h \ - DS_AudioDecoder.h DS_VideoDecoder.h +libds_filter_la_SOURCES = \ + allocator.c \ + cmediasample.c \ + guids.c \ + inputpin.c \ + outputpin.c \ + DS_Filter.c \ + DS_AudioDecoder.c \ + DS_VideoDecoder.c + +noinst_HEADERS = \ + allocator.h \ + cmediasample.h \ + guids.h \ + inputpin.h \ + interfaces.h \ + iunk.h \ + outputpin.h \ + DS_AudioDecoder.h \ + DS_Filter.h \ + DS_VideoDecoder.h debug: @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am index e4d54930f..10cfcd4a7 100644 --- a/src/libw32dll/Makefile.am +++ b/src/libw32dll/Makefile.am @@ -21,11 +21,13 @@ lib_LTLIBRARIES = $(w32dll_codec) xineplug_decode_w32dll_la_SOURCES = w32codec.c xineplug_decode_w32dll_la_LDFLAGS = -avoid-version -module -xineplug_decode_w32dll_la_LIBADD = $(top_builddir)/src/libw32dll/wine/libwine.la \ +xineplug_decode_w32dll_la_LIBADD = \ + $(top_builddir)/src/libw32dll/wine/libwine.la \ $(top_builddir)/src/xine-engine/libxine.la \ - $(top_builddir)/src/libw32dll/DirectShow/libds_filter.la @KSTAT_LIBS@ + $(top_builddir)/src/libw32dll/DirectShow/libds_filter.la \ + @KSTAT_LIBS@ -noinst_HEADERS = w32codec.h libwin32.h +noinst_HEADERS = libwin32.h w32codec.h debug: @list='$(SUBDIRS)'; for subdir in $$list; do \ diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am index 9cb51a5a2..8ea1cf55c 100644 --- a/src/libw32dll/wine/Makefile.am +++ b/src/libw32dll/wine/Makefile.am @@ -19,18 +19,58 @@ if HAVE_W32DLL wine_lib = libwine.la endif -libwine_la_SOURCES = afl.c elfdll.c module.c pe_resource.c \ - resource.c win32.c driver.c ext.c \ - pe_image.c registry.c vfl.c ldt_keeper.c +libwine_la_SOURCES = \ + afl.c \ + driver.c \ + elfdll.c \ + ext.c \ + ldt_keeper.c \ + module.c \ + pe_image.c + pe_resource.c \ + resource.c \ + registry.c \ + vfl.c \ + win32.c + libwine_la_LIBADD = stubs.lo -noinst_HEADERS = avifmt.h elfdll.h msacm.h pshpack1.h winbase.h \ - winnt.h basetsd.h heap.h msacmdrv.h pshpack2.h\ - windef.h winreg.h ldt.h ntdef.h ext.h \ - pshpack4.h windows.h winuser.h debugtools.h mmreg.h \ - pe_image.h pshpack8.h winerror.h driver.h module.h \ - poppack.h vfw.h loader.h registry.h win32.h \ - wineacm.h winestring.h resource.h ldt_keeper.h com.h +noinst_HEADERS = \ + avifmt.h \ + basetsd.h \ + com.h \ + debugtools.h \ + driver.h \ + elfdll.h \ + ext.h \ + heap.h \ + ldt.h \ + ldt_keeper.h \ + loader.h \ + mmreg.h \ + module.h \ + msacm.h \ + msacmdrv.h \ + ntdef.h \ + pe_image.h \ + poppack.h \ + pshpack1.h \ + pshpack2.h \ + pshpack4.h \ + pshpack8.h \ + registry.h \ + resource.h \ + vfw.h \ + win32.h\ + wineacm.h \ + winbase.h \ + windef.h \ + windows.h \ + winerror.h \ + winestring.h \ + winnt.h \ + winreg.h \ + winuser.h stubs.lo: stubs.s $(CC) -c $(srcdir)/stubs.s -o stubs.lo diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am index bc1efd95c..3cf0d36a7 100644 --- a/src/libxineadec/Makefile.am +++ b/src/libxineadec/Makefile.am @@ -4,8 +4,10 @@ libdir = $(XINE_PLUGINDIR) -lib_LTLIBRARIES = xineplug_decode_roqaudio.la xineplug_decode_adpcm.la \ - xineplug_decode_logpcm.la +lib_LTLIBRARIES = \ + xineplug_decode_adpcm.la \ + xineplug_decode_logpcm.la \ + xineplug_decode_roqaudio.la xineplug_decode_roqaudio_la_SOURCES = roqaudio.c xineplug_decode_roqaudio_la_LDFLAGS = -avoid-version -module diff --git a/src/libxinevdec/Makefile.am b/src/libxinevdec/Makefile.am index b8cf6bbf8..7622da1ce 100644 --- a/src/libxinevdec/Makefile.am +++ b/src/libxinevdec/Makefile.am @@ -7,12 +7,19 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic libdir = $(XINE_PLUGINDIR) -lib_LTLIBRARIES = xineplug_decode_cinepak.la xineplug_decode_cyuv.la \ - xineplug_decode_msvc.la xineplug_decode_roqvideo.la \ - xineplug_decode_svq1.la xineplug_decode_fli.la \ - xineplug_decode_rgb.la xineplug_decode_yuv.la \ - xineplug_decode_msrle.la xineplug_decode_idcinvideo.la \ - xineplug_decode_qtsmc.la xineplug_decode_qtrpza.la \ +lib_LTLIBRARIES = \ + xineplug_decode_cinepak.la \ + xineplug_decode_cyuv.la \ + xineplug_decode_fli.la \ + xineplug_decode_idcinvideo.la \ + xineplug_decode_msrle.la \ + xineplug_decode_msvc.la \ + xineplug_decode_qtsmc.la \ + xineplug_decode_roqvideo.la \ + xineplug_decode_rgb.la \ + xineplug_decode_svq1.la \ + xineplug_decode_yuv.la \ + xineplug_decode_qtrpza.la \ xineplug_decode_wc3video.la xineplug_decode_cinepak_la_SOURCES = cinepak.c diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 2806170e1..2136ed73f 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -1,9 +1,13 @@ SUBDIRS = libdha vidix -VIDIX_CFLAGS = -I$(top_builddir)/src/video_out/vidix -I$(top_srcdir)/src/video_out/vidix +VIDIX_CFLAGS = -I$(top_builddir)/src/video_out/vidix \ + -I$(top_srcdir)/src/video_out/vidix -CFLAGS = @CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) -DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) -DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) -DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) +CFLAGS = @CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) \ + -DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) + +DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) $(LIBMPEG2_CFLAGS) \ + -DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic @@ -51,24 +55,28 @@ endif lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(aa_module) xineplug_vo_out_xv_la_SOURCES = deinterlace.c alphablend.c video_out_xv.c -xineplug_vo_out_xv_la_LIBADD = $(XV_LIB) $(X_LIBS) -lXext \ - $(top_builddir)/src/xine-utils/libxineutils.la +xineplug_vo_out_xv_la_LIBADD = \ + $(XV_LIB) \ + $(X_LIBS) \ + -lXext \ + $(top_builddir)/src/xine-engine/libxine.la + xineplug_vo_out_xv_la_LDFLAGS = -avoid-version -module xineplug_vo_out_xshm_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \ alphablend.c video_out_xshm.c xineplug_vo_out_xshm_la_LIBADD = $(X_LIBS) -lXext \ - $(top_builddir)/src/xine-utils/libxineutils.la + $(top_builddir)/src/xine-engine/libxine.la xineplug_vo_out_xshm_la_LDFLAGS = -avoid-version -module #xineplug_vo_out_opengl_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \ # alphablend.c video_out_opengl.c #xineplug_vo_out_opengl_la_LIBADD = $(OPENGL_LIBS) $(GLUT_LIBS) $(GLU_LIBS) $(X_LIBS) \ -# $(top_builddir)/src/xine-utils/libxineutils.la +# $(top_builddir)/src/xine-engine/libxine.la #xineplug_vo_out_opengl_la_LDFLAGS = -avoid-version -module # #xineplug_vo_out_syncfb_la_SOURCES = alphablend.c video_out_syncfb.c -#xineplug_vo_out_syncfb_la_LIBADD = $(X_LIBS) $(top_builddir)/src/xine-utils/libxineutils.la +#xineplug_vo_out_syncfb_la_LIBADD = $(X_LIBS) $(top_builddir)/src/xine-engine/libxine.la #xineplug_vo_out_syncfb_la_LDFLAGS = -avoid-version -module # xineplug_vo_out_aa_la_SOURCES = video_out_aa.c @@ -77,7 +85,7 @@ xineplug_vo_out_aa_la_LDFLAGS = -avoid-version -module # #xineplug_vo_out_fb_la_SOURCES = yuv2rgb.c yuv2rgb_mmx.c yuv2rgb_mlib.c \ # alphablend.c video_out_fb.c -#xineplug_vo_out_fb_la_LIBADD = $(top_builddir)/src/xine-utils/libxineutils.la +#xineplug_vo_out_fb_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la #xineplug_vo_out_fb_la_LDFLAGS = -avoid-version -module # #xineplug_vo_out_directfb_la_SOURCES = alphablend.c video_out_directfb.c @@ -92,7 +100,7 @@ xineplug_vo_out_aa_la_LDFLAGS = -avoid-version -module #xineplug_vo_out_vidix_la_LIBADD = $(X_LIBS) $(top_builddir)/src/video_out/vidix/libvidix.la #xineplug_vo_out_vidix_la_LDFLAGS = -avoid-version -module -noinst_HEADERS = yuv2rgb.h video_out_syncfb.h alphablend.h deinterlace.h +noinst_HEADERS = alphablend.h deinterlace.h video_out_syncfb.h yuv2rgb.h debug: @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) -DXINE_COMPILE" diff --git a/src/video_out/libdha/Makefile.am b/src/video_out/libdha/Makefile.am index 4115b2143..79d9617c5 100644 --- a/src/video_out/libdha/Makefile.am +++ b/src/video_out/libdha/Makefile.am @@ -19,7 +19,7 @@ EXTRA_PROGRAMS = test test_SOURCES = test.c test_LDADD = $(top_builddir)/src/video_out/libdha/libdha.la -noinst_HEADERS = AsmMacros.h libdha.h +noinst_HEADERS = AsmMacros.h libdha.h pci_ids.h pci_names.h pci_vendors.h ## for OpenBSD LIBS += -li386 diff --git a/src/video_out/libdha/sysdep/Makefile.am b/src/video_out/libdha/sysdep/Makefile.am index 70fc43949..5dc3ef70f 100644 --- a/src/video_out/libdha/sysdep/Makefile.am +++ b/src/video_out/libdha/sysdep/Makefile.am @@ -1,10 +1,33 @@ -EXTRA_DIST = libdha_os2.c pci_arm32.c pci_isc.c pci_netbsd.c pci_sco.c pci_x86.c \ - libdha_win32.c pci_bsdi.c pci_linux.c pci_openbsd.c pci_sparc.c pci_386bsd.c \ - pci_freebsd.c pci_lynx.c pci_os2.c pci_svr4.c pci_alpha.c pci_ia64.c pci_mach386.c \ - pci_powerpc.c pci_win32.c - -noinst_HEADERS = AsmMacros_alpha.h AsmMacros_ia64.h AsmMacros_sparc.h AsmMacros_arm32.h \ - AsmMacros_powerpc.h AsmMacros_x86.h +EXTRA_DIST = \ + libdha_os2.c \ + libdha_win32.c \ + pci_386bsd.c \ + pci_alpha.c \ + pci_arm32.c \ + pci_bsdi.c \ + pci_freebsd.c \ + pci_ia64.c \ + pci_isc.c \ + pci_linux.c \ + pci_lynx.c \ + pci_mach386.c \ + pci_netbsd.c \ + pci_openbsd.c \ + pci_os2.c \ + pci_powerpc.c \ + pci_sco.c \ + pci_sparc.c \ + pci_svr4.c \ + pci_win32.c \ + pci_x86.c + +noinst_HEADERS = \ + AsmMacros_alpha.h \ + AsmMacros_arm32.h \ + AsmMacros_ia64.h \ + AsmMacros_powerpc.h \ + AsmMacros_sparc.h \ + AsmMacros_x86.h debug: install-debug: diff --git a/src/video_out/vidix/Makefile.am b/src/video_out/vidix/Makefile.am index c32751d1a..f89457457 100644 --- a/src/video_out/vidix/Makefile.am +++ b/src/video_out/vidix/Makefile.am @@ -14,6 +14,9 @@ libvidix_la_SOURCES = vidixlib.c noinst_HEADERS = fourcc.h vidix.h vidixlib.h +AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \ + -I$(top_srcdir)/src/video_out/libdha + debug: @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) @STATIC@ -DXINE_COMPILE" diff --git a/src/video_out/vidix/drivers/Makefile.am b/src/video_out/vidix/drivers/Makefile.am index 8c0bb6f3d..a68628646 100644 --- a/src/video_out/vidix/drivers/Makefile.am +++ b/src/video_out/vidix/drivers/Makefile.am @@ -4,8 +4,15 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic libdir = $(XINE_PLUGINDIR)/vidix if HAVE_VIDIX -vidix_drivers = radeon_vid.la rage128_vid.la pm3_vid.la mach64_vid.la nvidia_vid.la \ - genfb_vid.la mga_vid.la mga_crtc2_vid.la +vidix_drivers = \ + genfb_vid.la \ + mach64_vid.la \ + mga_crtc2_vid.la \ + mga_vid.la \ + nvidia_vid.la \ + pm3_vid.la \ + radeon_vid.la \ + rage128_vid.la endif lib_LTLIBRARIES = $(vidix_drivers) @@ -74,6 +81,9 @@ mga_crtc2_vid_la_LDFLAGS = -avoid-version -module noinst_HEADERS = mach64.h nvidia.h pm3_regs.h radeon.h +AM_CPPFLAGS = -I$(top_srcdir)/src/video_out/vidix \ + -I$(top_srcdir)/src/video_out/libdha + debug: @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) -DXINE_COMPILE" diff --git a/src/video_out/vidix/drivers/genfb_vid.c b/src/video_out/vidix/drivers/genfb_vid.c index 3dacd4beb..82633eda3 100644 --- a/src/video_out/vidix/drivers/genfb_vid.c +++ b/src/video_out/vidix/drivers/genfb_vid.c @@ -6,11 +6,11 @@ #include <inttypes.h> #include <fcntl.h> -#include "../vidix.h" -#include "../fourcc.h" -#include "../../libdha/libdha.h" -#include "../../libdha/pci_ids.h" -#include "../../libdha/pci_names.h" +#include "vidix.h" +#include "fourcc.h" +#include "libdha.h" +#include "pci_ids.h" +#include "pci_names.h" #define DEMO_DRIVER 1 diff --git a/src/video_out/vidix/drivers/mach64_vid.c b/src/video_out/vidix/drivers/mach64_vid.c index 9b630375f..8c4f00868 100644 --- a/src/video_out/vidix/drivers/mach64_vid.c +++ b/src/video_out/vidix/drivers/mach64_vid.c @@ -25,11 +25,11 @@ #endif -#include "../vidix.h" -#include "../fourcc.h" -#include "../../libdha/libdha.h" -#include "../../libdha/pci_ids.h" -#include "../../libdha/pci_names.h" +#include "vidix.h" +#include "fourcc.h" +#include "libdha.h" +#include "pci_ids.h" +#include "pci_names.h" #include "mach64.h" diff --git a/src/video_out/vidix/drivers/mga_vid.c b/src/video_out/vidix/drivers/mga_vid.c index f34f5ed20..39b2176b2 100644 --- a/src/video_out/vidix/drivers/mga_vid.c +++ b/src/video_out/vidix/drivers/mga_vid.c @@ -54,11 +54,11 @@ #include <math.h> #include <inttypes.h> -#include "../vidix.h" -#include "../fourcc.h" -#include "../../libdha/libdha.h" -#include "../../libdha/pci_ids.h" -#include "../../libdha/pci_names.h" +#include "vidix.h" +#include "fourcc.h" +#include "libdha.h" +#include "pci_ids.h" +#include "pci_names.h" #if !defined(ENOTSUP) && defined(EOPNOTSUPP) #define ENOTSUP EOPNOTSUPP diff --git a/src/video_out/vidix/drivers/nvidia_vid.c b/src/video_out/vidix/drivers/nvidia_vid.c index 0a639e93a..4f40fdd33 100644 --- a/src/video_out/vidix/drivers/nvidia_vid.c +++ b/src/video_out/vidix/drivers/nvidia_vid.c @@ -5,11 +5,11 @@ #include <math.h> #include <inttypes.h> -#include "../vidix.h" -#include "../fourcc.h" -#include "../../libdha/libdha.h" -#include "../../libdha/pci_ids.h" -#include "../../libdha/pci_names.h" +#include "vidix.h" +#include "fourcc.h" +#include "libdha.h" +#include "pci_ids.h" +#include "pci_names.h" #include "nvidia.h" diff --git a/src/video_out/vidix/drivers/pm3_vid.c b/src/video_out/vidix/drivers/pm3_vid.c index 2078113cc..c5b97782c 100644 --- a/src/video_out/vidix/drivers/pm3_vid.c +++ b/src/video_out/vidix/drivers/pm3_vid.c @@ -25,12 +25,12 @@ #include <inttypes.h> #include <unistd.h> -#include "../vidix.h" -#include "../fourcc.h" -#include "../../libdha/libdha.h" -#include "../../libdha/pci_ids.h" -#include "../../libdha/pci_names.h" -#include "../../config.h" +#include "vidix.h" +#include "fourcc.h" +#include "libdha.h" +#include "pci_ids.h" +#include "pci_names.h" +#include "config.h" #include "pm3_regs.h" diff --git a/src/video_out/vidix/drivers/radeon_vid.c b/src/video_out/vidix/drivers/radeon_vid.c index ed5a4ee41..8d8805264 100644 --- a/src/video_out/vidix/drivers/radeon_vid.c +++ b/src/video_out/vidix/drivers/radeon_vid.c @@ -12,11 +12,11 @@ #include <math.h> #include <inttypes.h> #include <sys/mman.h> -#include "../../libdha/pci_ids.h" -#include "../../libdha/pci_names.h" -#include "../vidix.h" -#include "../fourcc.h" -#include "../../libdha/libdha.h" +#include "pci_ids.h" +#include "pci_names.h" +#include "vidix.h" +#include "fourcc.h" +#include "libdha.h" #include "radeon.h" #ifdef RAGE128 diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index f53694543..3eb49b69f 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -16,9 +16,10 @@ libxine_la_SOURCES = $(nvtv) xine.c metronom.c configfile.c buffer.c \ audio_decoder.c video_out.c audio_out.c resample.c events.c lrb.c \ video_overlay.c osd.c scratch.c locale.c demux.c vo_scale.c xine_interface.c libxine_la_DEPENDENCIES = @INTLLIBS@ -libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) -lm +libxine_la_LIBADD = $(THREAD_LIBS) $(DYNAMIC_LD_LIBS) @INTLLIBS@ $(ZLIB_LIBS) -lm -lxineutils libxine_la_LDFLAGS = \ + -L$(top_builddir)/src/xine-utils \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) include_HEADERS = buffer.h metronom.h configfile.h vo_scale.h \ diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index bcd604db8..9698771be 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -2,7 +2,7 @@ ## Process this file with automake to produce Makefile.in ## -lib_LTLIBRARIES = libxineutils.la +noinst_LTLIBRARIES = libxineutils.la EXTRA_DIST = ppcasm_string.S ppc_asm.tmpl @@ -12,13 +12,28 @@ endif CFLAGS = @CFLAGS@ $(THREAD_CFLAGS) -libxineutils_la_SOURCES = $(pppc_files) utils.c memcpy.c monitor.c cpu_accel.c xine_mutex.c xmllexer.c xmlparser.c color.c list.c +libxineutils_la_SOURCES = $(pppc_files) \ + cpu_accel.c \ + color.c \ + list.c \ + memcpy.c \ + monitor.c \ + utils.c \ + xine_mutex.c \ + xmllexer.c \ + xmlparser.c + libxineutils_la_LIBADD = $(THREAD_LIBS) libxineutils_la_LDFLAGS = \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -include_HEADERS = xineutils.h attributes.h compat.h xmllexer.h xmlparser.h ppcasm_string.h +include_HEADERS = attributes.h \ + compat.h \ + ppcasm_string.h \ + xineutils.h \ + xmllexer.h \ + xmlparser.h debug: @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(THREAD_CFLAGS)" |