From 19b84cd45f5be52401edae5852df4c889e832979 Mon Sep 17 00:00:00 2001
From: Daniel Caujolle-Bert <f1rmb@users.sourceforge.net>
Date: Sun, 7 Oct 2001 20:10:45 +0000
Subject: Add ogg/vorbis checks. Change divxdecore checks.

CVS patchset: 760
CVS date: 2001/10/07 20:10:45
---
 src/Makefile.am           |  2 +-
 src/libdivx4/Makefile.am  | 21 ++++++++-------------
 src/libvorbis/Makefile.am | 40 ++++++++++++----------------------------
 3 files changed, 21 insertions(+), 42 deletions(-)

(limited to 'src')

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
-- 
cgit v1.2.3