* when NOT using a standalone libdvdnav, we do NOT have to link the whole

  libdvdnav into the spu decoder plugin statically, only nav_read.c is needed
  (read: revert to old linking behaviour for included libdvdnav)
* beautification

CVS patchset: 4724
CVS date: 2003/04/30 16:49:33

6 files changed, 35 insertions, 30 deletions

diff --git a/src/libspudec/Makefile.am b/src/libspudec/Makefile.am
index a9114356a..6480f6788 100644
--- a/src/libspudec/Makefile.am
+++ b/src/libspudec/Makefile.am
@@ -2,25 +2,27 @@ LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 libdir = $(XINE_PLUGINDIR)
 
-# For DVD
-if HAVE_DVDNAV
-DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-  $(DVDNAV_CFLAGS)
-link_dvdnav = $(DVDNAV_LIBS)
-else
-DVD_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
-  -I$(top_srcdir)/src/input/libdvdnav/
-link_dvdnav = $(top_srcdir)/src/input/libdvdnav/libdvdnav.la
-endif
-
 lib_LTLIBRARIES = xineplug_decode_spu.la
 XINE_LIB = $(top_builddir)/src/xine-engine/libxine.la
 
+if HAVE_DVDNAV
+
+xineplug_decode_spu_la_SOURCES = \
+	spu.c \
+	xine_decoder.c
+xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(DVDNAV_LIBS)
+
+else
+
 xineplug_decode_spu_la_SOURCES = \
+	nav_read.c \
 	spu.c \
 	xine_decoder.c
+AM_CPPFLAGS = -I$(top_srcdir)/src/input/libdvdnav
+xineplug_decode_spu_la_LIBADD = $(XINE_LIB)
+
+endif
 
-xineplug_decode_spu_la_LIBADD = $(XINE_LIB) $(link_dvdnav)
 xineplug_decode_spu_la_LDFLAGS = -avoid-version -module @XINE_PLUGIN_MIN_SYMS@
 
 noinst_HEADERS = spu.h
diff --git a/src/libspudec/nav_read.c b/src/libspudec/nav_read.c
index 2c3b355f5..5244bfdd6 100644
--- a/src/libspudec/nav_read.c
+++ b/src/libspudec/nav_read.c
@@ -1 +1 @@
-#include "../input/libdvdread/nav_read.c"
+#include "../input/libdvdnav/nav_read.c"
diff --git a/src/libspudec/spu.c b/src/libspudec/spu.c
index ceb803032..4a94b4a8c 100644
--- a/src/libspudec/spu.c
+++ b/src/libspudec/spu.c
@@ -35,7 +35,7 @@
  * along with this program; see the file COPYING.  If not, write to
  * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
  *
- * $Id: spu.c,v 1.63 2003/04/29 15:58:32 jcdutton Exp $
+ * $Id: spu.c,v 1.64 2003/04/30 16:49:34 mroi Exp $
  *
  */
 
@@ -56,15 +56,14 @@
 #include "buffer.h"
 #include "xine-engine/bswap.h"
 #ifdef HAVE_DVDNAV
-#include <dvdnav/nav_read.h>
-#include <dvdnav/nav_print.h>
+#  include <dvdnav/nav_read.h>
+#  include <dvdnav/nav_print.h>
 #else
-#include "../input/libdvdnav/nav_read.h"
-#include "../input/libdvdnav/nav_print.h"
+#  include "nav_read.h"
+#  include "nav_print.h"
 #endif
 
 
-
 /*
 #define LOG_DEBUG 1
 #define LOG_BUTTON 1
diff --git a/src/libspudec/spu.h b/src/libspudec/spu.h
index e727991eb..eb28523d1 100644
--- a/src/libspudec/spu.h
+++ b/src/libspudec/spu.h
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: spu.h,v 1.20 2003/04/29 15:58:32 jcdutton Exp $
+ * $Id: spu.h,v 1.21 2003/04/30 16:49:34 mroi Exp $
  *
  * This file was originally part of the OMS program.
  *
@@ -36,9 +36,9 @@
 #include "video_out.h"
 #include "video_overlay.h"
 #ifdef HAVE_DVDNAV
-#include <dvdnav/nav_types.h>
+#  include <dvdnav/nav_types.h>
 #else
-#include "../input/libdvdnav/nav_types.h"
+#  include "nav_types.h"
 #endif
 
 #define NUM_SEQ_BUFFERS 50
diff --git a/src/libspudec/spu_decoder_api.h b/src/libspudec/spu_decoder_api.h
index 3a31c3374..e43cc51f2 100644
--- a/src/libspudec/spu_decoder_api.h
+++ b/src/libspudec/spu_decoder_api.h
@@ -26,10 +26,14 @@
 
 #define SPU_DECODER_IFACE_VERSION 13
 
-#ifdef HAVE_DVDNAV
-#include <dvdnav/nav_types.h>
+#ifdef XINE_COMPILE
+#  ifdef HAVE_DVDNAV
+#    include <dvdnav/nav_types.h>
+#  else
+#    include "../input/libdvdnav/nav_types.h"
+#  endif
 #else
-#include "../input/libdvdnav/nav_types.h"
+#  include "nav_types.h"
 #endif
 
 /*
diff --git a/src/libspudec/xine_decoder.c b/src/libspudec/xine_decoder.c
index 04f4e5bb2..68e09fa17 100644
--- a/src/libspudec/xine_decoder.c
+++ b/src/libspudec/xine_decoder.c
@@ -19,7 +19,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.96 2003/04/29 15:58:32 jcdutton Exp $
+ * $Id: xine_decoder.c,v 1.97 2003/04/30 16:49:35 mroi Exp $
  *
  * stuff needed to turn libspu into a xine decoder plugin
  */
@@ -38,11 +38,11 @@
 #include "xineutils.h"
 #include "spu.h"
 #ifdef HAVE_DVDNAV
-#include <dvdnav/nav_read.h>
-#include <dvdnav/nav_types.h>
+#  include <dvdnav/nav_read.h>
+#  include <dvdnav/nav_types.h>
 #else
-#include "../input/libdvdnav/nav_read.h"
-#include "../input/libdvdnav/nav_types.h"
+#  include "nav_read.h"
+#  include "nav_types.h"
 #endif
 
 /*