diff options
| author | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-10-07 20:10:45 +0000 |
|---|---|---|
| committer | Daniel Caujolle-Bert <f1rmb@users.sourceforge.net> | 2001-10-07 20:10:45 +0000 |
| commit | 19b84cd45f5be52401edae5852df4c889e832979 (patch) | |
| tree | c4caa6e58b1fade69f7ae4f5f92b5e15c2470b04 /src | |
| parent | fd99af790c0f3fe36373553870a301c39e34bf12 (diff) | |
| download | xine-lib-19b84cd45f5be52401edae5852df4c889e832979.tar.gz xine-lib-19b84cd45f5be52401edae5852df4c889e832979.tar.bz2 | |
Add ogg/vorbis checks. Change divxdecore checks.
CVS patchset: 760
CVS date: 2001/10/07 20:10:45
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libdivx4/Makefile.am | 21 | ||||
| -rw-r--r-- | src/libvorbis/Makefile.am | 40 |
3 files changed, 21 insertions, 42 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index af8b4dd06..7b284b9e3 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = audio_out video_out dxr3 input libmpeg2 libspudec demuxers \ liba52 libffmpeg liblpcm libw32dll libmad libdts libvfill \ - libvorbis xine-engine libdivx4 + libvorbis libdivx4 xine-engine debug: @list='$(SUBDIRS)'; for subdir in $$list; do \ diff --git a/src/libdivx4/Makefile.am b/src/libdivx4/Makefile.am index a8e425dbc..cebb2ab86 100644 --- a/src/libdivx4/Makefile.am +++ b/src/libdivx4/Makefile.am @@ -6,25 +6,20 @@ CFLAGS = @GLOBAL_CFLAGS@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic -if HAVE_DIVXDECORE -divx4_codec = xineplug_decode_divx4.la -endif - libdir = $(XINE_PLUGINDIR) -lib_LTLIBRARIES = $(divx4_codec) - -xineplug_decode_divx4_la_SOURCES = xine_decoder.c +if HAVE_DIVX4 +divx4_module = xineplug_decode_divx4.la +endif -xineplug_decode_divx4_la_LDFLAGS = -ldivxdecore -avoid-version -module +lib_LTLIBRARIES = $(divx4_module) -#noinst_HEADERS = config.h +xineplug_decode_divx4_la_SOURCES = xine_decoder.c +xineplug_decode_divx4_la_LIBADD = @DIVX4_LIBS@ +xineplug_decode_divx4_la_LDFLAGS = -avoid-version -module debug: - @list='$(SUBDIRS)'; for subdir in $$list; do \ - (cd $$subdir && $(MAKE) $@) || exit;\ - done; - @$(MAKE) CFLAGS="@DEBUG_CFLAGS@" + @$(MAKE) CFLAGS="$(DEBUG_CFLAGS)" install-debug: debug @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am diff --git a/src/libvorbis/Makefile.am b/src/libvorbis/Makefile.am index 8beec93b8..286a1befa 100644 --- a/src/libvorbis/Makefile.am +++ b/src/libvorbis/Makefile.am @@ -1,42 +1,26 @@ -CFLAGS = @GLOBAL_CFLAGS@ +## +## Process this file with automake to produce Makefile.in +## + +CFLAGS = @GLOBAL_CFLAGS@ @OGG_CFLAGS@ @VORBIS_CFLAGS@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic libdir = $(XINE_PLUGINDIR) -lib_LTLIBRARIES = xineplug_decode_vorbis.la +if HAVE_VORBIS +vorbis_module = xineplug_decode_vorbis.la +endif + +lib_LTLIBRARIES = $(vorbis_module) xineplug_decode_vorbis_la_SOURCES = xine_decoder.c -xineplug_decode_vorbis_la_LIBADD = -lvorbis +xineplug_decode_vorbis_la_LIBADD = @OGG_LIBS@ @VORBIS_LIBS@ xineplug_decode_vorbis_la_LDFLAGS = -avoid-version -module - -## -## 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)" + @$(MAKE) CFLAGS="$(DEBUG_CFLAGS) @OGG_CFLAGS@ @VORBIS_CFLAGS@" install-debug: debug @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am |