[DVDnav-discuss] r1045 - in trunk/libdvdnav: Makefile configure.ac configure2 examples/Makefile.am misc/dvdnav-config.in src/Makefile.am src/dvdnav.h src/libdvdread/Makefile.am src/libdvdread/ifo_print.h src/vm/Makefile.am

nicodvb subversion at mplayerhq.hu
Sat May 31 14:34:25 CEST 2008 

Author: nicodvb
Date: Sat May 31 14:34:25 2008
New Revision: 1045

Log:
adapted the tree to the dvdread->libdvdread transition

Modified:
   trunk/libdvdnav/Makefile
   trunk/libdvdnav/configure.ac
   trunk/libdvdnav/configure2
   trunk/libdvdnav/examples/Makefile.am
   trunk/libdvdnav/misc/dvdnav-config.in
   trunk/libdvdnav/src/Makefile.am
   trunk/libdvdnav/src/dvdnav.h
   trunk/libdvdnav/src/libdvdread/Makefile.am
   trunk/libdvdnav/src/libdvdread/ifo_print.h
   trunk/libdvdnav/src/vm/Makefile.am

Modified: trunk/libdvdnav/Makefile
==============================================================================
--- trunk/libdvdnav/Makefile	(original)
+++ trunk/libdvdnav/Makefile	Sat May 31 14:34:25 2008
@@ -27,19 +27,19 @@ ifeq ($(DVDREAD),internal)
 DVDREAD_L=libdvdread
 DVDREAD_LIB = $(DVDREAD_L).a
 DVDREAD_SHLIB = $(DVDREAD_L).so
-VPATH+= $(SRC_PATH_BARE)/src/dvdread
-DVDREAD_HEADERS = src/dvdread/dvd_reader.h \
-	src/dvdread/ifo_print.h \
-	src/dvdread/ifo_read.h \
-	src/dvdread/ifo_types.h \
-	src/dvdread/nav_print.h \
-	src/dvdread/nav_read.h \
-	src/dvdread/dvd_udf.h \
-	src/dvdread/nav_types.h \
-	src/dvdread/bitreader.h
+VPATH+= $(SRC_PATH_BARE)/src/libdvdread
+DVDREAD_HEADERS = src/libdvdread/dvd_reader.h \
+	src/libdvdread/ifo_print.h \
+	src/libdvdread/ifo_read.h \
+	src/libdvdread/ifo_types.h \
+	src/libdvdread/nav_print.h \
+	src/libdvdread/nav_read.h \
+	src/libdvdread/dvd_udf.h \
+	src/libdvdread/nav_types.h \
+	src/libdvdread/bitreader.h
 DVDREAD_SRCS = dvd_input.c dvd_reader.c dvd_udf.c ifo_print.c ifo_read.c \
 	md5.c nav_print.c nav_read.c bitreader.c
-CFLAGS += -I$(SRC_PATH)/src/dvdread
+CFLAGS += -I$(SRC_PATH)/src/libdvdread
 else
 CFLAGS += -I$(DVDREAD_DIR)
 endif

Modified: trunk/libdvdnav/configure.ac
==============================================================================
--- trunk/libdvdnav/configure.ac	(original)
+++ trunk/libdvdnav/configure.ac	Sat May 31 14:34:25 2008
@@ -224,7 +224,7 @@ dnl ------------------------------------
 AC_OUTPUT([
 Makefile 
 src/Makefile
-src/dvdread/Makefile
+src/libdvdread/Makefile
 src/vm/Makefile
 misc/Makefile
 misc/dvdnav-config

Modified: trunk/libdvdnav/configure2
==============================================================================
--- trunk/libdvdnav/configure2	(original)
+++ trunk/libdvdnav/configure2	Sat May 31 14:34:25 2008
@@ -49,7 +49,7 @@ show_help(){
 SHARED=yes
 STATIC=yes
 DVDREAD=internal
-dvdread_dir=src/dvdread/
+dvdread_dir=src/libdvdread/
 PREFIX=/usr/local/
 INSTALLSTRIP=-s
 USEDEBUG=-g
@@ -102,7 +102,7 @@ PREFIX=`cd $PREFIX && pwd`
 
 test -z "$libdir" && libdir=$PREFIX/lib
 test -z "$shlibdir" && shlibdir=$PREFIX/lib
-test -z "$incdir" && incdir=$PREFIX/include/dvdnav && dvdread_incdir=$PREFIX/include/dvdread
+test -z "$incdir" && incdir=$PREFIX/include/dvdnav && dvdread_incdir=$PREFIX/include/libdvdread
 
 if [ "$DVDREAD" != "internal" ] ; then
   if [ -d "$DVDREAD" -a -f "$DVDREAD/dvd_reader.h" ] ; then

Modified: trunk/libdvdnav/examples/Makefile.am
==============================================================================
--- trunk/libdvdnav/examples/Makefile.am	(original)
+++ trunk/libdvdnav/examples/Makefile.am	Sat May 31 14:34:25 2008
@@ -1,6 +1,6 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CPPFLAGS = -DDVDNAV_COMPILE -I$(top_srcdir)/src -I$(top_srcdir)/src/dvdread
+AM_CPPFLAGS = -DDVDNAV_COMPILE -I$(top_srcdir)/src -I$(top_srcdir)/src/libdvdread
 
 DVDNAV_LIB = $(top_builddir)/src/libdvdnav.la
 

Modified: trunk/libdvdnav/misc/dvdnav-config.in
==============================================================================
--- trunk/libdvdnav/misc/dvdnav-config.in	(original)
+++ trunk/libdvdnav/misc/dvdnav-config.in	Sat May 31 14:34:25 2008
@@ -76,7 +76,7 @@ if test "$echo_exec_prefix" = "yes"; the
 fi
 
 if test "$echo_cflags" = "yes"; then
-      echo -I at includedir@ -I at includedir@/dvdread @THREAD_CFLAGS@
+      echo -I at includedir@ -I at includedir@/libdvdread @THREAD_CFLAGS@
 fi
 
 if test "$echo_libs" = "yes"; then

Modified: trunk/libdvdnav/src/Makefile.am
==============================================================================
--- trunk/libdvdnav/src/Makefile.am	(original)
+++ trunk/libdvdnav/src/Makefile.am	Sat May 31 14:34:25 2008
@@ -1,11 +1,11 @@
 include $(top_srcdir)/misc/Makefile.common
 
-SUBDIRS = dvdread vm
+SUBDIRS = libdvdread vm
 
 includedir = ${prefix}/include/dvdnav
 
 AM_CPPFLAGS = -DDVDNAV_COMPILE $(THREAD_CFLAGS) \
-	-I$(top_srcdir)/src/dvdread -I$(top_srcdir)/src/vm
+	-I$(top_srcdir)/src/libdvdread -I$(top_srcdir)/src/vm
 
 EXTRA_DIST = README.MAP FELLOWSHIP.map
 
@@ -17,7 +17,7 @@ libdvdnav_la_SOURCES = dvdnav.c \
 	dvdnav_internal.h read_cache.h remap.h
 
 libdvdnav_la_LIBADD = $(THREAD_LIBS) \
-	$(top_builddir)/src/dvdread/libdvdread.la \
+	$(top_builddir)/src/libdvdread/libdvdread.la \
 	$(top_builddir)/src/vm/libdvdvm.la
 
 libdvdnav_la_LDFLAGS = \

Modified: trunk/libdvdnav/src/dvdnav.h
==============================================================================
--- trunk/libdvdnav/src/dvdnav.h	(original)
+++ trunk/libdvdnav/src/dvdnav.h	Sat May 31 14:34:25 2008
@@ -37,9 +37,9 @@ extern "C" {
 
 #ifndef DVDNAV_COMPILE
 #  include <dvdnav/dvd_types.h>
-#  include <dvdread/dvd_reader.h>
-#  include <dvdread/nav_types.h>
-#  include <dvdread/ifo_types.h> /* For vm_cmd_t */
+#  include <libdvdread/dvd_reader.h>
+#  include <libdvdread/nav_types.h>
+#  include <libdvdread/ifo_types.h> /* For vm_cmd_t */
 #  include <dvdnav/dvdnav_events.h>
 #endif
 

Modified: trunk/libdvdnav/src/libdvdread/Makefile.am
==============================================================================
--- trunk/libdvdnav/src/libdvdread/Makefile.am	(original)
+++ trunk/libdvdnav/src/libdvdread/Makefile.am	Sat May 31 14:34:25 2008
@@ -1,6 +1,6 @@
 include $(top_srcdir)/misc/Makefile.common
 
-includedir = ${prefix}/include/dvdread
+includedir = ${prefix}/include/libdvdread
 
 AM_CPPFLAGS = -DDVDNAV_COMPILE -I$(top_srcdir)/src/vm
 

Modified: trunk/libdvdnav/src/libdvdread/ifo_print.h
==============================================================================
--- trunk/libdvdnav/src/libdvdread/ifo_print.h	(original)
+++ trunk/libdvdnav/src/libdvdread/ifo_print.h	Sat May 31 14:34:25 2008
@@ -24,7 +24,7 @@
 #ifdef DVDNAV_COMPILE
 #  include "ifo_types.h"
 #else
-#  include <dvdread/ifo_types.h> /*  Only for vm_cmd_t  */
+#  include <libdvdread/ifo_types.h> /*  Only for vm_cmd_t  */
 #endif
 
 void ifo_print(dvd_reader_t *dvd, int title);

Modified: trunk/libdvdnav/src/vm/Makefile.am
==============================================================================
--- trunk/libdvdnav/src/vm/Makefile.am	(original)
+++ trunk/libdvdnav/src/vm/Makefile.am	Sat May 31 14:34:25 2008
@@ -3,7 +3,7 @@ include $(top_srcdir)/misc/Makefile.comm
 includedir = ${prefix}/include/dvdnav
 
 AM_CPPFLAGS = -DDVDNAV_COMPILE $(THREAD_CFLAGS) \
-	-I$(top_srcdir)/src -I$(top_srcdir)/src/dvdread
+	-I$(top_srcdir)/src -I$(top_srcdir)/src/libdvdread
 
 noinst_LTLIBRARIES = libdvdvm.la

More information about the DVDnav-discuss mailing list