diff options
72 files changed, 165 insertions, 1565 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 27eeecdc9..e626af771 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,4 @@ +include $(top_srcdir)/misc/Makefile.common SUBDIRS = man hackersguide faq @@ -29,14 +30,3 @@ uninstall-local: rm -f $$dir/$$name; \ echo "removing $$dir/$$name" ; \ done - -debug: -install-debug: install - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/doc/faq/Makefile.am b/doc/faq/Makefile.am index 9a3d5079a..3b4d2c15c 100644 --- a/doc/faq/Makefile.am +++ b/doc/faq/Makefile.am @@ -1,3 +1,4 @@ +include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = $(docs_DOCS) README faq.sgml docdir = $(prefix)/share/doc/xine/faq @@ -24,14 +25,3 @@ uninstall-local: rm -f $$dir/$$name; \ echo "removing $$dir/$$name" ; \ done - -debug: -install-debug: install - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/doc/hackersguide/Makefile.am b/doc/hackersguide/Makefile.am index 934d315ee..c8974d51b 100644 --- a/doc/hackersguide/Makefile.am +++ b/doc/hackersguide/Makefile.am @@ -1,12 +1,5 @@ +include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = README intro.sgml hackersguide.sgml architecture.fig overlays.fig docdir = $(prefix)/share/doc/xine/hackersguide - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am index 27993c425..2f7d162d2 100644 --- a/doc/man/Makefile.am +++ b/doc/man/Makefile.am @@ -1,9 +1,3 @@ -SUBDIRS = en - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* +include $(top_srcdir)/misc/Makefile.common -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in +SUBDIRS = en diff --git a/doc/man/en/Makefile.am b/doc/man/en/Makefile.am index f6d18e0c8..fa4bdde84 100644 --- a/doc/man/en/Makefile.am +++ b/doc/man/en/Makefile.am @@ -1,12 +1,5 @@ +include $(top_srcdir)/misc/Makefile.common man_MANS = xine-config.1 EXTRA_DIST = $(man_MANS) - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/include/Makefile.am b/include/Makefile.am index 286ecc2f1..664001b16 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,23 +1,7 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = xine.h.in include_HEADERS = xine.h CONFIG_CLEAN_FILES = xine.h - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/intl/Makefile.in b/intl/Makefile.in index 468bae54b..b38eb9a00 100644 --- a/intl/Makefile.in +++ b/intl/Makefile.in @@ -25,6 +25,8 @@ top_srcdir = @top_srcdir@ top_builddir = .. VPATH = @srcdir@ +include $(top_srcdir)/misc/Makefile.common + prefix = @prefix@ exec_prefix = @exec_prefix@ transform = @program_transform_name@ @@ -307,12 +309,6 @@ Makefile: Makefile.in ../config.status cd .. \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec install-data - # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/m4/Makefile.am b/m4/Makefile.am index b9b7a4736..128058997 100644 --- a/m4/Makefile.am +++ b/m4/Makefile.am @@ -1,6 +1,4 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common if INSTALL_M4 m4datadir = @ACLOCAL_DIR@ @@ -35,16 +33,3 @@ EXTRA_DIST = \ xine.m4 \ _xine.m4 \ xvid.m4 - -debug: - -install-debug: install - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/misc/Makefile.am b/misc/Makefile.am index 0bc97ffc8..7c7569cda 100644 --- a/misc/Makefile.am +++ b/misc/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/misc/Makefile.common + SUBDIRS = fonts EXTRA_DIST = build_rpms.sh \ @@ -16,19 +18,6 @@ bin_SCRIPTS = xine-config pkgconfigdir=$(libdir)/pkgconfig pkgconfig_DATA=libxine.pc -debug: - -install-debug: install - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in - xine-fontconv: xine-fontconv.c $(CC) -W -Wall -g -o xine-fontconv xine-fontconv.c -lz `freetype-config --cflags` `freetype-config --libs` diff --git a/misc/Makefile.common b/misc/Makefile.common new file mode 100644 index 000000000..399aa54fb --- /dev/null +++ b/misc/Makefile.common @@ -0,0 +1,43 @@ +LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic +XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la + +$(XINE_LIB): + @cd $(top_srcdir)/src/xine-engine && $(MAKE) + +install-data-hook: + @if [ -x "$(top_srcdir)/post-install.sh" ] && [ "$$MAKELEVEL" -eq 0 ]; then \ + $(top_srcdir)/post-install.sh; \ + fi + +debug: + @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" + +install-debug: debug + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + @list='$(SUBDIRS)'; for subdir in $$list; do \ + (cd $$subdir && $(MAKE) $@) || exit; \ + done; + $(MAKE) $(AM_MAKEFLAGS) install-data-hook + +install-includeHEADERS: $(include_HEADERS) + @$(NORMAL_INSTALL) + $(mkinstalldirs) $(DESTDIR)$(includedir)/xine + @list='$(include_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ + echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ + $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ + done + +uninstall-includeHEADERS: + @$(NORMAL_UNINSTALL) + list='$(include_HEADERS)'; for p in $$list; do \ + rm -f $(DESTDIR)$(includedir)/xine/$$p; \ + done + +mostlyclean-generic: + -rm -f *~ \#* .*~ .\#* + +maintainer-clean-generic: + -@echo "This command is intended for maintainers to use;" + -@echo "it deletes files that may require special tools to rebuild." + -rm -f Makefile.in diff --git a/misc/fonts/Makefile.am b/misc/fonts/Makefile.am index 6da9d4e2c..1fb649c6a 100644 --- a/misc/fonts/Makefile.am +++ b/misc/fonts/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/misc/Makefile.common + datadir = $(XINE_FONTDIR) data_DATA = \ cetus-16.xinefont.gz \ @@ -33,16 +35,3 @@ data_DATA = \ # font used for osd # EXTRA_DIST = cetus.ttf README.cetus $(data_DATA) - -debug: - -install-debug: install - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 9c1ebf5c6..f38366d30 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -21,6 +21,8 @@ srcdir = @srcdir@ top_srcdir = @top_srcdir@ VPATH = @srcdir@ +include $(top_srcdir)/misc/Makefile.common + prefix = @prefix@ exec_prefix = @exec_prefix@ datadir = @datadir@ @@ -194,9 +196,6 @@ Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ $(SHELL) ./config.status -debug: -install-debug: install - # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/src/Makefile.am b/src/Makefile.am index 15a2a4b2d..6ee20c116 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/misc/Makefile.common + # Order is important be careful changing SUBDIRS #SUBDIRS = \ # libdivx4 \ @@ -29,24 +31,3 @@ SUBDIRS = \ libfaad \ libflac \ post - -debug: - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit; \ - done; - -install-debug: debug - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit; \ - done; - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@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 8989ee7b7..e535ef6ee 100644 --- a/src/audio_out/Makefile.am +++ b/src/audio_out/Makefile.am @@ -1,9 +1,9 @@ +include $(top_srcdir)/misc/Makefile.common + AM_CFLAGS = -DXINE_COMPILE $(ALSA_CFLAGS) $(ESD_CFLAGS) $(IRIXAL_CFLAGS) $(ARTS_CFLAGS) EXTRA_DIST = audio_irixal_out.c -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - libdir = $(XINE_PLUGINDIR) if HAVE_OSS @@ -76,21 +76,3 @@ xineplug_ao_out_sun_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ 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 @XINE_PLUGIN_MIN_SYMS@ - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in - diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index d627e56a3..001e3b035 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -1,6 +1,6 @@ -AM_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) @ANSI_FLAGS@ +include $(top_srcdir)/misc/Makefile.common -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic +AM_CFLAGS = $(THEORA_CFLAGS) $(OGG_CFLAGS) @ANSI_FLAGS@ libdir = $(XINE_PLUGINDIR) @@ -27,8 +27,6 @@ endif # --------- # All of xine demuxer plugins should be named like the scheme "xineplug_dmx_" -XINELIB = $(top_builddir)/src/xine-engine/libxine.la - lib_LTLIBRARIES = $(ogg_module) $(asf_module) $(mng_module) $(image_module) \ xineplug_dmx_games.la \ xineplug_dmx_audio.la \ @@ -46,128 +44,88 @@ lib_LTLIBRARIES = $(ogg_module) $(asf_module) $(mng_module) $(image_module) \ xineplug_dmx_yuv_frames.la xineplug_dmx_ogg_la_SOURCES = demux_ogg.c -xineplug_dmx_ogg_la_LIBADD = $(OGG_LIBS) $(VORBIS_LIBS) $(THEORA_LIBS) $(XINELIB) +xineplug_dmx_ogg_la_LIBADD = $(OGG_LIBS) $(VORBIS_LIBS) $(THEORA_LIBS) $(XINE_LIB) xineplug_dmx_ogg_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_avi_la_SOURCES = demux_avi.c -xineplug_dmx_avi_la_LIBADD = $(XINELIB) +xineplug_dmx_avi_la_LIBADD = $(XINE_LIB) xineplug_dmx_avi_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_mpeg_block_la_SOURCES = demux_mpeg_block.c -xineplug_dmx_mpeg_block_la_LIBADD = $(XINELIB) +xineplug_dmx_mpeg_block_la_LIBADD = $(XINE_LIB) xineplug_dmx_mpeg_block_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_mpeg_la_SOURCES = demux_mpeg.c -xineplug_dmx_mpeg_la_LIBADD = $(XINELIB) +xineplug_dmx_mpeg_la_LIBADD = $(XINE_LIB) xineplug_dmx_mpeg_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_mpeg_elem_la_SOURCES = demux_elem.c -xineplug_dmx_mpeg_elem_la_LIBADD = $(XINELIB) +xineplug_dmx_mpeg_elem_la_LIBADD = $(XINE_LIB) xineplug_dmx_mpeg_elem_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ ##remove me on pes reactivation EXTRA_DIST = demux_pes.c #xineplug_dmx_mpeg_pes_la_SOURCES = demux_pes.c -#xineplug_dmx_mpeg_pes_la_LIBADD = $(XINELIB) +#xineplug_dmx_mpeg_pes_la_LIBADD = $(XINE_LIB) #xineplug_dmx_mpeg_pes_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_mpeg_ts_la_SOURCES = demux_ts.c -xineplug_dmx_mpeg_ts_la_LIBADD = $(XINELIB) +xineplug_dmx_mpeg_ts_la_LIBADD = $(XINE_LIB) xineplug_dmx_mpeg_ts_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_qt_la_SOURCES = demux_qt.c -xineplug_dmx_qt_la_LIBADD = $(XINELIB) +xineplug_dmx_qt_la_LIBADD = $(XINE_LIB) xineplug_dmx_qt_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_asf_la_SOURCES = demux_asf.c -xineplug_dmx_asf_la_LIBADD = $(XINELIB) +xineplug_dmx_asf_la_LIBADD = $(XINE_LIB) xineplug_dmx_asf_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_fli_la_SOURCES = demux_fli.c -xineplug_dmx_fli_la_LIBADD = $(XINELIB) +xineplug_dmx_fli_la_LIBADD = $(XINE_LIB) xineplug_dmx_fli_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_yuv4mpeg2_la_SOURCES = demux_yuv4mpeg2.c -xineplug_dmx_yuv4mpeg2_la_LIBADD = $(XINELIB) +xineplug_dmx_yuv4mpeg2_la_LIBADD = $(XINE_LIB) xineplug_dmx_yuv4mpeg2_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_real_la_SOURCES = demux_real.c -xineplug_dmx_real_la_LIBADD = $(XINELIB) +xineplug_dmx_real_la_LIBADD = $(XINE_LIB) xineplug_dmx_real_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_rawdv_la_SOURCES = demux_rawdv.c -xineplug_dmx_rawdv_la_LIBADD = $(XINELIB) +xineplug_dmx_rawdv_la_LIBADD = $(XINE_LIB) xineplug_dmx_rawdv_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_mng_la_SOURCES = demux_mng.c -xineplug_dmx_mng_la_LIBADD = $(XINELIB) $(ZLIB_LIBS) $(MNG_LIBS) +xineplug_dmx_mng_la_LIBADD = $(XINE_LIB) $(ZLIB_LIBS) $(MNG_LIBS) xineplug_dmx_mng_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_pva_la_SOURCES = demux_pva.c -xineplug_dmx_pva_la_LIBADD = $(XINELIB) +xineplug_dmx_pva_la_LIBADD = $(XINE_LIB) xineplug_dmx_pva_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_games_la_SOURCES = group_games.c demux_eawve.c \ demux_idcin.c demux_ipmovie.c demux_roq.c \ demux_vqa.c demux_wc3movie.c demux_str.c \ demux_film.c demux_smjpeg.c -xineplug_dmx_games_la_LIBADD = $(XINELIB) +xineplug_dmx_games_la_LIBADD = $(XINE_LIB) xineplug_dmx_games_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_audio_la_SOURCES = group_audio.c demux_aud.c demux_aiff.c \ demux_cdda.c demux_mpgaudio.c demux_nsf.c \ demux_realaudio.c demux_snd.c demux_voc.c \ demux_vox.c demux_wav.c demux_ac3.c -xineplug_dmx_audio_la_LIBADD = $(XINELIB) +xineplug_dmx_audio_la_LIBADD = $(XINE_LIB) xineplug_dmx_audio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_yuv_frames_la_SOURCES = demux_yuv_frames.c -xineplug_dmx_yuv_frames_la_LIBADD = $(XINELIB) +xineplug_dmx_yuv_frames_la_LIBADD = $(XINE_LIB) xineplug_dmx_yuv_frames_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_dmx_image_la_SOURCES = demux_image.c -xineplug_dmx_image_la_LIBADD = $(XINELIB) +xineplug_dmx_image_la_LIBADD = $(XINE_LIB) xineplug_dmx_image_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ include_HEADERS = demux.h noinst_HEADERS = asfheader.h qtpalette.h - -$(XINELIB): - @cd $(top_builddir)/src/xine-engine && $(MAKE) - -## -## Install header files (default=$includedir/xine) -## -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir)/xine - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -## -## Remove them -## -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/xine/$$p; \ - done - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in - diff --git a/src/dxr3/Makefile.am b/src/dxr3/Makefile.am index 8cd3759c2..b5e219a2f 100644 --- a/src/dxr3/Makefile.am +++ b/src/dxr3/Makefile.am @@ -1,7 +1,6 @@ -AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS) +include $(top_srcdir)/misc/Makefile.common -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic -XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la +AM_CFLAGS = $(X_CFLAGS) $(LIBFAME_CFLAGS) libdir = $(XINE_PLUGINDIR) @@ -46,49 +45,9 @@ xineplug_vo_out_dxr3_la_SOURCES = \ xineplug_vo_out_dxr3_la_LIBADD = $(link_fame) $(link_rte) $(link_x_libs) $(XINE_LIB) xineplug_vo_out_dxr3_la_LDFLAGS = -avoid-version -module -$(XINE_LIB): - @cd $(top_builddir)/src/xine-engine && $(MAKE) - noinst_HEADERS = \ em8300.h \ alphablend.h \ dxr3.h \ dxr3_scr.h \ video_out_dxr3.h - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -### -# Install header files (default=$includedir/xine) -# -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir)/xine - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -### -# Remove them -# -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 33e2c283f..d04395100 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -1,6 +1,4 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = input_dvd.c input_vcd.c input_gnome_vfs.c input_rtp.c @@ -10,9 +8,6 @@ else SUBDIRS = dvb libreal librtsp libdvdnav endif -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic -XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la - libdir = $(XINE_PLUGINDIR) ## @@ -141,49 +136,3 @@ xineplug_inp_pvr_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ include_HEADERS = input_plugin.h noinst_HEADERS = net_buf_ctrl.h mms.h mmsh.h pnm.h media_helper.h videodev2.h - -$(XINE_LIB): - @cd $(top_builddir)/src/xine-engine && $(MAKE) - -## -## Install header files (default=$includedir/xine) -## -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir)/xine - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -## -## Remove them -## -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -debug: - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit;\ - done; - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit;\ - done; - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/input/dvb/Makefile.am b/src/input/dvb/Makefile.am index b3682a971..229ac21bf 100644 --- a/src/input/dvb/Makefile.am +++ b/src/input/dvb/Makefile.am @@ -1,20 +1,5 @@ +include $(top_srcdir)/misc/Makefile.common + noinst_HEADERS = \ dmx.h \ frontend.h - -debug: - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit;\ - done; - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/input/libdvdnav/Makefile.am b/src/input/libdvdnav/Makefile.am index 6a8394e22..5704fc854 100644 --- a/src/input/libdvdnav/Makefile.am +++ b/src/input/libdvdnav/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/misc/Makefile.common + DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE AM_CPPFLAGS = -DDVDNAV_COMPILE @@ -49,17 +51,3 @@ noinst_HEADERS = \ dvd_input.h \ dvd_udf.h \ bswap.h - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(DVD_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/input/libreal/Makefile.am b/src/input/libreal/Makefile.am index e25abe1be..dd5fb5993 100644 --- a/src/input/libreal/Makefile.am +++ b/src/input/libreal/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/misc/Makefile.common + REAL_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -I$(srcdir)/../librtsp AM_CFLAGS = $(REAL_CFLAGS) @ANSI_FLAGS@ @@ -17,17 +19,3 @@ noinst_HEADERS = \ asmrp.h \ rmff.h \ sdpplin.h - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(DVD_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/input/librtsp/Makefile.am b/src/input/librtsp/Makefile.am index feb9df98a..29c38db20 100644 --- a/src/input/librtsp/Makefile.am +++ b/src/input/librtsp/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/misc/Makefile.common + RTSP_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -I$(srcdir)/../libreal AM_CFLAGS = $(RTSP_CFLAGS) @ANSI_FLAGS@ @@ -13,17 +15,3 @@ librtsp_la_LDFLAGS = $(THREAD_LIBS) -avoid-version -module noinst_HEADERS = \ rtsp.h \ rtsp_session.h - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(DVD_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/liba52/Makefile.am b/src/liba52/Makefile.am index 15b0c41a6..45349b507 100644 --- a/src/liba52/Makefile.am +++ b/src/liba52/Makefile.am @@ -1,8 +1,8 @@ +include $(top_srcdir)/misc/Makefile.common + AM_CFLAGS = $(LIBA52_CFLAGS) DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(LIBA52_CFLAGS) -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic -XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_a52.la @@ -23,43 +23,3 @@ noinst_HEADERS = \ a52_internal.h \ bitstream.h \ tables.h - -$(XINE_LIB): - @cd $(top_builddir)/src/xine-engine && $(MAKE) - -## -## Install header files (default=$includedir/xine) -## -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir)/xine - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -## -## Remove them -## -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libdivx4/Makefile.am b/src/libdivx4/Makefile.am index 83ad8842b..8c3337d51 100644 --- a/src/libdivx4/Makefile.am +++ b/src/libdivx4/Makefile.am @@ -1,8 +1,4 @@ -## -## Process this file with automake to produce Makefile.in -## - -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic +include $(top_srcdir)/misc/Makefile.common libdir = $(XINE_PLUGINDIR) @@ -12,17 +8,3 @@ xineplug_decode_divx4_la_SOURCES = xine_decoder.c xineplug_decode_divx4_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ noinst_HEADERS = decore-if.h - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libdts/Makefile.am b/src/libdts/Makefile.am index 5c8f76ade..ef634bdac 100644 --- a/src/libdts/Makefile.am +++ b/src/libdts/Makefile.am @@ -1,5 +1,4 @@ - -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic +include $(top_srcdir)/misc/Makefile.common libdir = $(XINE_PLUGINDIR) @@ -7,42 +6,3 @@ lib_LTLIBRARIES = xineplug_decode_dts.la xineplug_decode_dts_la_SOURCES = xine_decoder.c xineplug_decode_dts_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - -noinst_HEADERS = - -## -## Install header files (default=$includedir/xine) -## -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir)/xine - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -## -## Remove them -## -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libfaad/Makefile.am b/src/libfaad/Makefile.am index dc9863aad..888ff7c3c 100644 --- a/src/libfaad/Makefile.am +++ b/src/libfaad/Makefile.am @@ -1,12 +1,7 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common SUBDIRS = codebook -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic -XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la - libdir = $(XINE_PLUGINDIR) if BUILD_FAAD @@ -97,20 +92,3 @@ noinst_HEADERS = \ structs.h \ syntax.h \ tns.h - -$(XINE_LIB): - @cd $(top_builddir)/src/xine-engine && $(MAKE) - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libfaad/codebook/Makefile.am b/src/libfaad/codebook/Makefile.am index af2e85b18..bd2f22e5f 100644 --- a/src/libfaad/codebook/Makefile.am +++ b/src/libfaad/codebook/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/misc/Makefile.common + EXTRA_DIST = hcb.h \ hcb_1.c \ hcb_2.c \ @@ -11,15 +13,3 @@ EXTRA_DIST = hcb.h \ hcb_10.c \ hcb_11.c \ hcb_sf.c - -all: -debug: -install-debug: - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index acdfd6c08..44297a054 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -1,6 +1,4 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common SUBDIRS = libavcodec @@ -10,8 +8,6 @@ EXTRA_DIST = INTERNAL_DOCS = diff_to_ffmpeg_cvs.txt -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic -XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_ff.la @@ -21,23 +17,3 @@ xineplug_decode_ff_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_decode_ff_la_LIBADD = $(XINE_LIB) \ $(top_builddir)/src/libffmpeg/libavcodec/libavcodec.la \ $(top_builddir)/src/libffmpeg/libavcodec/libpostproc/libpostprocess.la - -debug: - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit;\ - done; - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in - -$(XINE_LIB): - @cd $(top_builddir)/src/xine-engine && $(MAKE) diff --git a/src/libffmpeg/libavcodec/Makefile.am b/src/libffmpeg/libavcodec/Makefile.am index 2c0f6a74b..a27478a5a 100644 --- a/src/libffmpeg/libavcodec/Makefile.am +++ b/src/libffmpeg/libavcodec/Makefile.am @@ -1,6 +1,4 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common SUBDIRS = armv4l i386 mlib alpha libpostproc @@ -13,8 +11,6 @@ EXTRA_DIST = fdctref.c imgresample.c motion_est_template.c svq3.c wmv2.c \ AM_CFLAGS = $(LIBFFMPEG_CFLAGS) -DCONFIG_RISKY ASFLAGS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - noinst_LTLIBRARIES = libavcodec.la libavcodec_la_SOURCES = \ @@ -83,20 +79,3 @@ noinst_HEADERS = \ .s.lo: $(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$< - -debug: - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit;\ - done; - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libffmpeg/libavcodec/alpha/Makefile.am b/src/libffmpeg/libavcodec/alpha/Makefile.am index 372f030d8..90fbf4c23 100644 --- a/src/libffmpeg/libavcodec/alpha/Makefile.am +++ b/src/libffmpeg/libavcodec/alpha/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/misc/Makefile.common + EXTRA_DIST = asm.h \ dsputil_alpha.c \ mpegvideo_alpha.c \ @@ -6,19 +8,3 @@ EXTRA_DIST = asm.h \ regdef.h \ dsputil_alpha_asm.S \ simple_idct_alpha.c - -all: - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libffmpeg/libavcodec/armv4l/Makefile.am b/src/libffmpeg/libavcodec/armv4l/Makefile.am index 833d96068..e8b811d1a 100644 --- a/src/libffmpeg/libavcodec/armv4l/Makefile.am +++ b/src/libffmpeg/libavcodec/armv4l/Makefile.am @@ -1,12 +1,8 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = -O2 $(LIBFFMPEG_CFLAGS) ASFLAGS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - noinst_LTLIBRARIES = libavcodec_armv4l.la libavcodec_armv4l_src = dsputil_arm.c jrevdct_arm.S @@ -24,17 +20,3 @@ noinst_HEADERS = .s.lo: $(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$< - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libffmpeg/libavcodec/i386/Makefile.am b/src/libffmpeg/libavcodec/i386/Makefile.am index 58fa8c47e..34fc82988 100644 --- a/src/libffmpeg/libavcodec/i386/Makefile.am +++ b/src/libffmpeg/libavcodec/i386/Makefile.am @@ -1,9 +1,5 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common -# we must not use CFLAGS here, gcc optimizations produce -# bad code if we do so. AM_CFLAGS = $(LIBFFMPEG_CFLAGS) # CFLAGS is here to filter out -funroll-loops because it causes bad # behavior of libavcodec @@ -11,8 +7,6 @@ CFLAGS = `echo @CFLAGS@ | sed -e 's/-funroll-loops//g'` ASFLAGS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - noinst_LTLIBRARIES = libavcodec_mmx.la libavcodec_mmx_src = \ @@ -43,17 +37,3 @@ noinst_HEADERS = dsputil_mmx_avg.h dsputil_mmx_rnd.h mmx.h .s.lo: $(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$< - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libffmpeg/libavcodec/libpostproc/Makefile.am b/src/libffmpeg/libavcodec/libpostproc/Makefile.am index 10328eeff..60aa5f9a3 100644 --- a/src/libffmpeg/libavcodec/libpostproc/Makefile.am +++ b/src/libffmpeg/libavcodec/libpostproc/Makefile.am @@ -1,8 +1,8 @@ +include $(top_srcdir)/misc/Makefile.common + AM_CFLAGS = $(LIBFFMPEG_CFLAGS) ASFLAGS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - noinst_LTLIBRARIES = libpostprocess.la EXTRA_DIST = postprocess_template.c @@ -13,17 +13,3 @@ noinst_HEADERS = mangle.h postprocess.h postprocess_internal.h .s.lo: $(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$< - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libffmpeg/libavcodec/mlib/Makefile.am b/src/libffmpeg/libavcodec/mlib/Makefile.am index e3c632577..73f2495d6 100644 --- a/src/libffmpeg/libavcodec/mlib/Makefile.am +++ b/src/libffmpeg/libavcodec/mlib/Makefile.am @@ -1,12 +1,8 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(LIBFFMPEG_CFLAGS) ASFLAGS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - noinst_LTLIBRARIES = libavcodec_mlib.la libavcodec_mlib_src = dsputil_mlib.c @@ -24,17 +20,3 @@ noinst_HEADERS = .s.lo: $(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$< - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS) -DCONFIG_DECODERS -DHAVE_AV_CONFIG_H" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libffmpeg/libavcodec/ppc/Makefile.am b/src/libffmpeg/libavcodec/ppc/Makefile.am index bb4618713..781df406c 100644 --- a/src/libffmpeg/libavcodec/ppc/Makefile.am +++ b/src/libffmpeg/libavcodec/ppc/Makefile.am @@ -1,6 +1,4 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common # we must not use CFLAGS here, gcc optimizations produce # bad code if we do so. @@ -8,8 +6,6 @@ AM_CFLAGS = $(LIBFFMPEG_CFLAGS) ASFLAGS = -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - noinst_LTLIBRARIES = libavcodec_ppc.la libavcodec_ppc_src = dsputil_altivec.c \ @@ -34,17 +30,3 @@ noinst_HEADERS = dsputil_altivec.h dsputil_ppc.h .s.lo: $(ASCOMPILE) -o $@ `test -f $< || echo '$(srcdir)/'`$< - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libflac/Makefile.am b/src/libflac/Makefile.am index 6c3a4e05a..8358402a3 100644 --- a/src/libflac/Makefile.am +++ b/src/libflac/Makefile.am @@ -1,40 +1,15 @@ -# -# the Makefile for flac plugins -# +include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(LIBFLAC_CFLAGS) -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - if HAVE_FLAC flac_module = xineplug_flac.la endif libdir = $(XINE_PLUGINDIR) -XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la lib_LTLIBRARIES = $(flac_module) xineplug_flac_la_SOURCES = demux_flac.c decoder_flac.c xineplug_flac_la_LIBADD = $(LIBFLAC_LIBS) xineplug_flac_la_LDFLAGS = -avoid-version -module -lFLAC @XINE_PLUGIN_MIN_SYMS@ - - -# noinst_HEADERS = - -$(XINE_LIB): - @cd $(top_builddir)/src/xine-engine && $(MAKE) - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/liblpcm/Makefile.am b/src/liblpcm/Makefile.am index 841caeb8d..9f3fad21e 100644 --- a/src/liblpcm/Makefile.am +++ b/src/liblpcm/Makefile.am @@ -1,5 +1,4 @@ - -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic +include $(top_srcdir)/misc/Makefile.common libdir = $(XINE_PLUGINDIR) @@ -7,42 +6,3 @@ lib_LTLIBRARIES = xineplug_decode_lpcm.la xineplug_decode_lpcm_la_SOURCES = xine_decoder.c xineplug_decode_lpcm_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - -noinst_HEADERS = - -## -## Install header files (default=$includedir/xine) -## -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir)/xine - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -## -## Remove them -## -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libmad/Makefile.am b/src/libmad/Makefile.am index 72a3d3205..4d4d4a3d7 100644 --- a/src/libmad/Makefile.am +++ b/src/libmad/Makefile.am @@ -1,9 +1,9 @@ +include $(top_srcdir)/misc/Makefile.common + AM_CFLAGS = -DOPT_SPEED EXTRA_DIST = imdct_l_arm.S -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_mad.la @@ -41,41 +41,3 @@ noinst_HEADERS = \ synth.h \ timer.h \ version.h - - -## -## Install header files (default=$includedir/xine) -## -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir)/xine - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -## -## Remove them -## -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libmpeg2/Makefile.am b/src/libmpeg2/Makefile.am index 5f1d1b64b..d84b43780 100644 --- a/src/libmpeg2/Makefile.am +++ b/src/libmpeg2/Makefile.am @@ -1,17 +1,12 @@ +include $(top_srcdir)/misc/Makefile.common + AM_CFLAGS = $(LIBMPEG2_CFLAGS) -#DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(LIBMPEG2_CFLAGS) EXTRA_DIST = idct_mlib.c idct_mlib.h motion_comp_mlib.c -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_mpeg2.la -XINE_LIB = $(top_builddir)/src/xine-engine/libxine.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 = \ cpu_state.c \ @@ -33,20 +28,3 @@ xineplug_decode_mpeg2_la_LIBADD = $(XINE_LIB) xineplug_decode_mpeg2_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ noinst_HEADERS = vlc.h mpeg2.h mpeg2_internal.h - -$(XINE_LIB): - @cd $(top_builddir)/src/xine-engine && $(MAKE) - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libmpg123/Makefile.am b/src/libmpg123/Makefile.am index 6750d9c5a..4c4392ecc 100644 --- a/src/libmpg123/Makefile.am +++ b/src/libmpg123/Makefile.am @@ -1,4 +1,4 @@ -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic +include $(top_srcdir)/misc/Makefile.common libdir = $(XINE_PLUGINDIR) @@ -18,41 +18,3 @@ xineplug_decode_mpg123_la_SOURCES = \ xineplug_decode_mpg123_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ noinst_HEADERS = huffman.h mpg123.h mpglib.h l2tables.h - - -## -## Install header files (default=$includedir/xine) -## -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir)/xine - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -## -## Remove them -## -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libreal/Makefile.am b/src/libreal/Makefile.am index bd79fe1e1..bf6adc19e 100644 --- a/src/libreal/Makefile.am +++ b/src/libreal/Makefile.am @@ -1,8 +1,4 @@ -## -## Process this file with automake to produce Makefile.in -## - -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic +include $(top_srcdir)/misc/Makefile.common libdir = $(XINE_PLUGINDIR) @@ -15,18 +11,3 @@ xineplug_decode_real_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_decode_real_audio_la_SOURCES = audio_decoder.c xineplug_decode_real_audio_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) xineplug_decode_real_audio_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - -debug: -# @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS)" - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libspucc/Makefile.am b/src/libspucc/Makefile.am index fd15735ef..fb746bd41 100644 --- a/src/libspucc/Makefile.am +++ b/src/libspucc/Makefile.am @@ -1,52 +1,11 @@ -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic +include $(top_srcdir)/misc/Makefile.common libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_spucc.la -XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la xineplug_decode_spucc_la_SOURCES = cc_decoder.c xine_decoder.c xineplug_decode_spucc_la_LIBADD = $(XINE_LIB) xineplug_decode_spucc_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ noinst_HEADERS = cc_decoder.h - -$(XINE_LIB): - @cd $(top_builddir)/src/xine-engine && $(MAKE) - -## -## Install header files (default=$includedir/xine) -## -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir)/xine - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -## -## Remove them -## -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am index 2d7478d20..264c17161 100644 --- a/src/libspudec/Makefile.am +++ b/src/libspudec/Makefile.am @@ -1,9 +1,8 @@ -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic +include $(top_srcdir)/misc/Makefile.common libdir = $(XINE_PLUGINDIR) lib_LTLIBRARIES = xineplug_decode_spu.la -XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la if HAVE_DVDNAV @@ -28,43 +27,3 @@ xineplug_decode_spu_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ noinst_HEADERS = spu.h include_HEADERS = spu_decoder_api.h - -$(XINE_LIB): - @cd $(top_builddir)/src/xine-engine && $(MAKE) - -## -## Install header files (default=$includedir/xine) -## -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir)/xine - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -## -## Remove them -## -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libsputext/Makefile.am b/src/libsputext/Makefile.am index 1e0c2e194..ca5af05e0 100644 --- a/src/libsputext/Makefile.am +++ b/src/libsputext/Makefile.am @@ -1,4 +1,4 @@ -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic +include $(top_srcdir)/misc/Makefile.common libdir = $(XINE_PLUGINDIR) @@ -20,40 +20,3 @@ xineplug_decode_sputext_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYM xineplug_decode_spuogm_la_SOURCES = xine_decoder_ogm.c xineplug_decode_spuogm_la_LIBADD = $(XINELIB) xineplug_decode_spuogm_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - -## -## Install header files (default=$includedir/xine) -## -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir)/xine - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -## -## Remove them -## -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libtheora/Makefile.am b/src/libtheora/Makefile.am index 7ac49ef19..69384efef 100644 --- a/src/libtheora/Makefile.am +++ b/src/libtheora/Makefile.am @@ -1,11 +1,7 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(THEORA_CFLAGS) -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - libdir = $(XINE_PLUGINDIR) if HAVE_THEORA @@ -17,18 +13,3 @@ lib_LTLIBRARIES = $(theora_module) xineplug_decode_theora_la_SOURCES = xine_decoder.c xineplug_decode_theora_la_LIBADD = $(OGG_LIBS) $(THEORA_LIBS) xineplug_decode_theora_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - -debug: -# @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(OGG_CFLAGS) $(THEORA_CFLAGS)" - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libvorbis/Makefile.am b/src/libvorbis/Makefile.am index fb979aa08..29a071993 100644 --- a/src/libvorbis/Makefile.am +++ b/src/libvorbis/Makefile.am @@ -1,11 +1,7 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(VORBIS_CFLAGS) -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - libdir = $(XINE_PLUGINDIR) if HAVE_VORBIS @@ -17,18 +13,3 @@ lib_LTLIBRARIES = $(vorbis_module) xineplug_decode_vorbis_la_SOURCES = xine_decoder.c xineplug_decode_vorbis_la_LIBADD = $(VORBIS_LIBS) xineplug_decode_vorbis_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - -debug: -# @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS)" - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libw32dll/DirectShow/Makefile.am b/src/libw32dll/DirectShow/Makefile.am index 688060d88..a74c65815 100644 --- a/src/libw32dll/DirectShow/Makefile.am +++ b/src/libw32dll/DirectShow/Makefile.am @@ -1,14 +1,10 @@ +include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \ -Wmissing-prototypes -Wimplicit-function-declaration \ -DWIN32_PATH=\"@w32_path@\" -DNOAVIFILE_HEADERS \ -I$(srcdir)/.. -I$(srcdir)/../wine -#DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \ -# -Wmissing-prototypes -Wimplicit-function-declaration \ -# -DWIN32_PATH=\\\"@w32_path@\\\" -DNOAVIFILE_HEADERS \ -# -I$(srcdir)/.. -I$(srcdir)/../wine - if HAVE_W32DLL ds_filter_lib = libds_filter.la endif @@ -36,14 +32,3 @@ noinst_HEADERS = \ DS_AudioDecoder.h \ DS_Filter.h \ DS_VideoDecoder.h - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libw32dll/Makefile.am b/src/libw32dll/Makefile.am index 2362a0dff..aaaaea49b 100644 --- a/src/libw32dll/Makefile.am +++ b/src/libw32dll/Makefile.am @@ -1,6 +1,6 @@ -AM_CFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"@w32_path@\" +include $(top_srcdir)/misc/Makefile.common -#DEBUG_CFLAGS = @DEBUG_CFLAGS@ -I$(srcdir)/wine +AM_CFLAGS = -I$(srcdir)/wine -DWIN32_PATH=\"@w32_path@\" SUBDIRS = wine DirectShow dmo qtx @@ -9,15 +9,8 @@ w32dll_codec = xineplug_decode_w32dll.la qt_codec = xineplug_decode_qt.la endif -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic -XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la libdir = $(XINE_PLUGINDIR) -## -# IMPORTANT: -# --------- -# All of xine codecs should be named like the scheme "xineplug_decode_" -# lib_LTLIBRARIES = $(w32dll_codec) $(qt_codec) xineplug_decode_w32dll_la_SOURCES = w32codec.c @@ -37,23 +30,3 @@ xineplug_decode_qt_la_LIBADD = \ @KSTAT_LIBS@ noinst_HEADERS = libwin32.h w32codec.h - -$(XINE_LIB): - @cd $(top_builddir)/src/xine-engine && $(MAKE) - -debug: - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit;\ - done; - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libw32dll/dmo/Makefile.am b/src/libw32dll/dmo/Makefile.am index a5aa17323..2b7cd3e37 100644 --- a/src/libw32dll/dmo/Makefile.am +++ b/src/libw32dll/dmo/Makefile.am @@ -1,14 +1,10 @@ +include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(X_CFLAGS) -fno-omit-frame-pointer \ -Wmissing-prototypes -Wimplicit-function-declaration \ -DWIN32_PATH=\"@w32_path@\" -DNOAVIFILE_HEADERS \ -I$(srcdir)/.. -I$(srcdir)/../wine -#DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) -fno-omit-frame-pointer \ -# -Wmissing-prototypes -Wimplicit-function-declaration \ -# -DWIN32_PATH=\\\"@w32_path@\\\" -DNOAVIFILE_HEADERS \ -# -I$(srcdir)/.. -I$(srcdir)/../wine - if HAVE_W32DLL dmo_filter_lib = libdmo_filter.la endif @@ -29,14 +25,3 @@ noinst_HEADERS = \ DMO_Filter.h \ dmo.h \ DMO_VideoDecoder.h - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libw32dll/qtx/Makefile.am b/src/libw32dll/qtx/Makefile.am index 96dc8d4e4..060aa6acd 100644 --- a/src/libw32dll/qtx/Makefile.am +++ b/src/libw32dll/qtx/Makefile.am @@ -1,13 +1,3 @@ -SUBDIRS = qtxsdk - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in +include $(top_srcdir)/misc/Makefile.common +SUBDIRS = qtxsdk diff --git a/src/libw32dll/qtx/qtxsdk/Makefile.am b/src/libw32dll/qtx/qtxsdk/Makefile.am index 87991c24f..30aeab5e9 100644 --- a/src/libw32dll/qtx/qtxsdk/Makefile.am +++ b/src/libw32dll/qtx/qtxsdk/Makefile.am @@ -1,18 +1,3 @@ -noinst_HEADERS = components.h select.h - -debug: - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit;\ - done; - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +include $(top_srcdir)/misc/Makefile.common -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in +noinst_HEADERS = components.h select.h diff --git a/src/libw32dll/wine/Makefile.am b/src/libw32dll/wine/Makefile.am index 6960ce3b7..2e9893207 100644 --- a/src/libw32dll/wine/Makefile.am +++ b/src/libw32dll/wine/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/misc/Makefile.common + EXTRA_DIST = stubs.s wrapper.S noinst_LTLIBRARIES = $(wine_lib) @@ -77,15 +79,3 @@ stubs.lo: stubs.s wrapper.lo: wrapper.S $(CC) -c $(srcdir)/wrapper.S -o wrapper.lo - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in - diff --git a/src/libxineadec/Makefile.am b/src/libxineadec/Makefile.am index e58ac8d30..6451cc3b7 100644 --- a/src/libxineadec/Makefile.am +++ b/src/libxineadec/Makefile.am @@ -1,13 +1,8 @@ -# -# the Makefile for the native xine audio decoders -# +include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = fooaudio.c -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - libdir = $(XINE_PLUGINDIR) -XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la AM_CFLAGS = -DNSF_PLAYER @@ -55,20 +50,3 @@ xineplug_decode_28k8_la_LIBADD = $(top_builddir)/src/xine-engine/libxine.la xineplug_decode_28k8_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ # noinst_HEADERS = - -$(XINE_LIB): - @cd $(top_builddir)/src/xine-engine && $(MAKE) - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libxineadec/gsm610/Makefile.am b/src/libxineadec/gsm610/Makefile.am index 4076efc55..07fc0e2fa 100644 --- a/src/libxineadec/gsm610/Makefile.am +++ b/src/libxineadec/gsm610/Makefile.am @@ -1,8 +1,4 @@ -## -## Process this file with automake to produce Makefile.in -## - -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic +include $(top_srcdir)/misc/Makefile.common noinst_LTLIBRARIES = libgsm610.la @@ -26,18 +22,3 @@ noinst_HEADERS = \ private.h \ proto.h \ unproto.h - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in - diff --git a/src/libxineadec/nosefart/Makefile.am b/src/libxineadec/nosefart/Makefile.am index 0d421c2fa..78744b002 100644 --- a/src/libxineadec/nosefart/Makefile.am +++ b/src/libxineadec/nosefart/Makefile.am @@ -1,8 +1,4 @@ -## -## Process this file with automake to produce Makefile.in -## - -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic +include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = -DNSF_PLAYER @@ -38,18 +34,3 @@ noinst_HEADERS = \ osd.h \ version.h \ vrcvisnd.h - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(LIBFFMPEG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in - diff --git a/src/libxinevdec/Makefile.am b/src/libxinevdec/Makefile.am index 3598a0145..97918c3e5 100644 --- a/src/libxinevdec/Makefile.am +++ b/src/libxinevdec/Makefile.am @@ -1,13 +1,12 @@ -EXTRA_DIST = foovideo.c +include $(top_srcdir)/misc/Makefile.common -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic +EXTRA_DIST = foovideo.c if HAVE_LIBPNG image_module = xineplug_decode_image.la endif libdir = $(XINE_PLUGINDIR) -XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la lib_LTLIBRARIES = $(image_module) \ xineplug_decode_cinepak.la \ @@ -96,20 +95,3 @@ xineplug_decode_image_la_LIBADD = $(XINE_LIB) $(DYNAMIC_LD_LIBS) $(PNG_LIBS) xineplug_decode_image_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ noinst_HEADERS = svq1_codebooks.h - -$(XINE_LIB): - @cd $(top_builddir)/src/xine-engine && $(MAKE) - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/libxvid/Makefile.am b/src/libxvid/Makefile.am index 506a2e3fe..1735cf741 100644 --- a/src/libxvid/Makefile.am +++ b/src/libxvid/Makefile.am @@ -1,6 +1,6 @@ -AM_CFLAGS = @XVID_CFLAGS@ +include $(top_srcdir)/misc/Makefile.common -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic +AM_CFLAGS = @XVID_CFLAGS@ libdir = $(XINE_PLUGINDIR) @@ -14,17 +14,3 @@ lib_LTLIBRARIES = $(xvid_modules) xineplug_decode_xvid_la_SOURCES = xine_decoder.c xineplug_decode_xvid_la_LIBADD = @XVID_LIBS@ xineplug_decode_xvid_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/post/Makefile.am b/src/post/Makefile.am index b555bbd57..d24bfbcba 100644 --- a/src/post/Makefile.am +++ b/src/post/Makefile.am @@ -1,22 +1,4 @@ +include $(top_srcdir)/misc/Makefile.common + SUBDIRS = \ planar goom visualizations mosaico - -debug: - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit; \ - done; - -install-debug: debug - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit; \ - done; - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in - diff --git a/src/post/goom/Makefile.am b/src/post/goom/Makefile.am index f0037b7af..76aee8ca8 100644 --- a/src/post/goom/Makefile.am +++ b/src/post/goom/Makefile.am @@ -1,10 +1,4 @@ -## -## Process this file with automake to produce Makefile.in -## - -DEBUG_CFLAGS = @DEBUG_CFLAGS@ @ANSI_FLAGS@ - -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic +include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = zoom_filter_mmx.c ppc_zoom_ultimate.s @@ -35,18 +29,3 @@ xineplug_post_goom_la_SOURCES = xine_goom.c \ xineplug_post_goom_la_LIBADD = $(XINE_LIB) xineplug_post_goom_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in - diff --git a/src/post/mosaico/Makefile.am b/src/post/mosaico/Makefile.am index 3b2c26c01..e110215ac 100644 --- a/src/post/mosaico/Makefile.am +++ b/src/post/mosaico/Makefile.am @@ -1,11 +1,6 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = @ANSI_FLAGS@ -DEBUG_CFLAGS = @DEBUG_CFLAGS@ @ANSI_FLAGS@ - -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic libdir = $(XINE_PLUGINDIR)/post @@ -18,17 +13,3 @@ xineplug_post_mosaico_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ xineplug_post_switch_la_SOURCES = switch.c xineplug_post_switch_la_LIBADD = $(XINE_LIB) xineplug_post_switch_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/post/planar/Makefile.am b/src/post/planar/Makefile.am index 59d4518aa..d140b932b 100644 --- a/src/post/planar/Makefile.am +++ b/src/post/planar/Makefile.am @@ -1,11 +1,6 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = @ANSI_FLAGS@ -DEBUG_CFLAGS = @DEBUG_CFLAGS@ @ANSI_FLAGS@ - -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic libdir = $(XINE_PLUGINDIR)/post @@ -14,17 +9,3 @@ lib_LTLIBRARIES = xineplug_post_invert.la xineplug_post_invert_la_SOURCES = invert.c xineplug_post_invert_la_LIBADD = $(XINE_LIB) xineplug_post_invert_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/post/visualizations/Makefile.am b/src/post/visualizations/Makefile.am index e8870d55b..318ce7ef7 100644 --- a/src/post/visualizations/Makefile.am +++ b/src/post/visualizations/Makefile.am @@ -1,13 +1,8 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = fooviz.c AM_CFLAGS = @ANSI_FLAGS@ -DEBUG_CFLAGS = @DEBUG_CFLAGS@ @ANSI_FLAGS@ - -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic libdir = $(XINE_PLUGINDIR)/post @@ -17,18 +12,3 @@ xineplug_post_visualizations_la_SOURCES = \ visualizations.c fftscope.c oscope.c xineplug_post_visualizations_la_LIBADD = $(XINE_LIB) xineplug_post_visualizations_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ -lm - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in - diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am index 9c745ffeb..d6ee1cb66 100644 --- a/src/video_out/Makefile.am +++ b/src/video_out/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/misc/Makefile.common + SUBDIRS = libdha vidix EXTRA_DIST = video_out_directfb.c video_out_opengl.c @@ -9,12 +11,6 @@ AM_CFLAGS = $(X_CFLAGS) \ -DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) \ $(AALIB_CFLAGS) $(MLIB_CFLAGS) -DEBUG_CFLAGS = @DEBUG_CFLAGS@ $(X_CFLAGS) \ - -DXINE_COMPILE $(SDL_CFLAGS) $(VIDIX_CFLAGS) \ - $(AALIB_CFLAGS) $(MLIB_CFLAGS) - -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - libdir = $(XINE_PLUGINDIR) if HAVE_X11 @@ -64,7 +60,6 @@ endif lib_LTLIBRARIES = $(xshm_module) $(xv_module) $(aa_module) $(pgx64_module) \ $(vidix_module) $(fb_module) $(sdl_module) $(syncfb_module) \ xineplug_vo_out_none.la -XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la xineplug_vo_out_xv_la_SOURCES = deinterlace.c alphablend.c video_out_xv.c xineplug_vo_out_xv_la_LIBADD = \ @@ -122,44 +117,3 @@ xineplug_vo_out_none_la_SOURCES = video_out_none.c xineplug_vo_out_none_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@ noinst_HEADERS = alphablend.h deinterlace.h video_out_syncfb.h yuv2rgb.h - -$(XINE_LIB): - @cd $(top_builddir)/src/xine-engine && $(MAKE) - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) -DXINE_COMPILE" - -install-debug: debug - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit;\ - done; - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -### -# Install header files (default=$includedir/xine) -# -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir)/xine - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/$$p; \ - done - -### -# Remove them -# -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - @list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/xine/$$p; \ - done - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/video_out/libdha/Makefile.am b/src/video_out/libdha/Makefile.am index fb59a4f7a..d6f870384 100644 --- a/src/video_out/libdha/Makefile.am +++ b/src/video_out/libdha/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/misc/Makefile.common + EXTRA_DIST = README pci_db2c.awk SUBDIRS = bin kernelhelper oth sysdep @@ -36,21 +38,3 @@ pci_names.lo: $(awk_generated) depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' \ $(CCDEPMODE) $(depcomp) \ $(LTCOMPILE) -c -o $@ `test -f $*.c || echo '$(srcdir)/'`$*.c - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) @STATIC@ -DXINE_COMPILE" - -install-debug: debug - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit;\ - done; - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* test - -rm -f $(awk_generated) - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/video_out/libdha/bin/Makefile.am b/src/video_out/libdha/bin/Makefile.am index 88eac9aca..24c6d3abf 100644 --- a/src/video_out/libdha/bin/Makefile.am +++ b/src/video_out/libdha/bin/Makefile.am @@ -1,12 +1,3 @@ -EXTRA_DIST = README mapdev.copyright mapdev.vxd - -debug: -install-debug: +include $(top_srcdir)/misc/Makefile.common -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in +EXTRA_DIST = README mapdev.copyright mapdev.vxd diff --git a/src/video_out/libdha/kernelhelper/Makefile.am b/src/video_out/libdha/kernelhelper/Makefile.am index 772bec98b..82a37eae3 100644 --- a/src/video_out/libdha/kernelhelper/Makefile.am +++ b/src/video_out/libdha/kernelhelper/Makefile.am @@ -1,3 +1,4 @@ +include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = README dhahelper.c @@ -50,14 +51,3 @@ uninstall-local: @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 - -debug: -install-debug: install - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* test - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/video_out/libdha/oth/Makefile.am b/src/video_out/libdha/oth/Makefile.am index 9d9956b41..55651d233 100644 --- a/src/video_out/libdha/oth/Makefile.am +++ b/src/video_out/libdha/oth/Makefile.am @@ -1,12 +1,3 @@ -EXTRA_DIST = pci.db - -debug: -install-debug: +include $(top_srcdir)/misc/Makefile.common -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in +EXTRA_DIST = pci.db diff --git a/src/video_out/libdha/sysdep/Makefile.am b/src/video_out/libdha/sysdep/Makefile.am index 014ef0cf0..807572c39 100644 --- a/src/video_out/libdha/sysdep/Makefile.am +++ b/src/video_out/libdha/sysdep/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/misc/Makefile.common + EXTRA_DIST = \ libdha_os2.c \ libdha_win32.c \ @@ -31,14 +33,3 @@ noinst_HEADERS = \ AsmMacros_powerpc.h \ AsmMacros_sparc.h \ AsmMacros_x86.h - -debug: -install-debug: - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/video_out/vidix/Makefile.am b/src/video_out/vidix/Makefile.am index 3c1461e48..7621a035a 100644 --- a/src/video_out/vidix/Makefile.am +++ b/src/video_out/vidix/Makefile.am @@ -1,3 +1,5 @@ +include $(top_srcdir)/misc/Makefile.common + EXTRA_DIST = README vidix.txt SUBDIRS = drivers @@ -17,20 +19,3 @@ 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" - -install-debug: debug - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit;\ - done; - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/video_out/vidix/drivers/Makefile.am b/src/video_out/vidix/drivers/Makefile.am index e2843305c..016c3f954 100644 --- a/src/video_out/vidix/drivers/Makefile.am +++ b/src/video_out/vidix/drivers/Makefile.am @@ -1,8 +1,7 @@ +include $(top_srcdir)/misc/Makefile.common EXTRA_DIST = genfb_vid.c nvidia_vid.c -LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic - libdir = $(XINE_PLUGINDIR)/vidix if HAVE_VIDIX @@ -81,17 +80,3 @@ noinst_HEADERS = mach64.h nvidia.h glint_regs.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" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* rage128_vid.c mga_crtc2_vid.c - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/xine-engine/Makefile.am b/src/xine-engine/Makefile.am index e79353708..d28686976 100644 --- a/src/xine-engine/Makefile.am +++ b/src/xine-engine/Makefile.am @@ -1,6 +1,4 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common SUBDIRS = nvtv @@ -41,46 +39,8 @@ noinst_HEADERS = bswap.h @INCLUDED_INTL_TRUE@@INTLLIBS@: @INCLUDED_INTL_TRUE@ @cd $(top_builddir)/intl && $(MAKE) libintl.la -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(THREAD_CFLAGS) $(X_CFLAGS) $(FT2_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - $(XINEUTILS_LIB): cd $(top_srcdir)/src/xine-utils && $(MAKE) libxineutils.la $(NVTVCLIENT_LIB): cd $(top_builddir)/src/xine-engine/nvtv && $(MAKE) libnvclient.la - -### -# Install header files (default=$includedir/xine) -# -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir)/xine - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/; \ - done - - -### -# Remove them -# -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/xine-engine/nvtv/Makefile.am b/src/xine-engine/nvtv/Makefile.am index 097b58cf2..2cace3681 100644 --- a/src/xine-engine/nvtv/Makefile.am +++ b/src/xine-engine/nvtv/Makefile.am @@ -1,4 +1,4 @@ -## Process this file with automake to produce Makefile.in +include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(X_CFLAGS) @@ -21,17 +21,3 @@ noinst_HEADERS = backend.h local.h tv_chip.h xf86i2c.h back_client.h debug.h \ miscstruct.h pipe.h tv_common.h xfree.h error.h libnvclient_la_LIBADD = $(X_LIBS) - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(X_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index 2464ba20b..669db2cc9 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -1,6 +1,4 @@ -## -## Process this file with automake to produce Makefile.in -## +include $(top_srcdir)/misc/Makefile.common noinst_LTLIBRARIES = libxineutils.la @@ -39,44 +37,3 @@ include_HEADERS = attributes.h \ xmllexer.h \ xmlparser.h \ xine_buffer.h - -debug: - @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) $(THREAD_CFLAGS) $(X_CFLAGS)" - -install-debug: debug - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - - - -### -# Install header files (default=$includedir/xine) -# -install-includeHEADERS: $(include_HEADERS) - @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(includedir)/xine - @list='$(include_HEADERS)'; for p in $$list; do \ - if test -f "$$p"; then d= ; else d="$(srcdir)/"; fi; \ - echo " $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/"; \ - $(INSTALL_DATA) $$d$$p $(DESTDIR)$(includedir)/xine/; \ - done - - -### -# Remove them -# -uninstall-includeHEADERS: - @$(NORMAL_UNINSTALL) - list='$(include_HEADERS)'; for p in $$list; do \ - rm -f $(DESTDIR)$(includedir)/xine/$$p; \ - done - - -mostlyclean-generic: - -rm -f *~ \#* .*~ .\#* - - -maintainer-clean-generic: - -@echo "This command is intended for maintainers to use;" - -@echo "it deletes files that may require special tools to rebuild." - -rm -f Makefile.in - |