[DVDnav-discuss] r1093 - in trunk/libdvdnav: configure.ac examples/Makefile.am misc/dvdread-config.sh msvc/libdvdnav.dsp src/Makefile.am src/libdvdread src/vm/Makefile.am

Sun Jun 8 11:12:14 CEST 2008

Author: nicodvb
Date: Sun Jun  8 11:12:14 2008
New Revision: 1093

Log:
finally removed libdvdread; new build build system temporarily broken: will fix in next commit

Removed:
   trunk/libdvdnav/misc/dvdread-config.sh
   trunk/libdvdnav/src/libdvdread/
Modified:
   trunk/libdvdnav/configure.ac
   trunk/libdvdnav/examples/Makefile.am
   trunk/libdvdnav/msvc/libdvdnav.dsp
   trunk/libdvdnav/src/Makefile.am
   trunk/libdvdnav/src/vm/Makefile.am

Modified: trunk/libdvdnav/configure.ac
==============================================================================

--- trunk/libdvdnav/configure.ac	(original)
+++ trunk/libdvdnav/configure.ac	Sun Jun  8 11:12:14 2008
@@ -229,7 +229,6 @@ dnl ------------------------------------
 AC_OUTPUT([
 Makefile 
 src/Makefile
-src/libdvdread/Makefile
 src/vm/Makefile
 misc/Makefile
 misc/dvdnav-config

Modified: trunk/libdvdnav/examples/Makefile.am
==============================================================================
--- trunk/libdvdnav/examples/Makefile.am	(original)
+++ trunk/libdvdnav/examples/Makefile.am	Sun Jun  8 11:12:14 2008
@@ -1,13 +1,13 @@
 include $(top_srcdir)/misc/Makefile.common
 
-AM_CPPFLAGS = -DDVDNAV_COMPILE -I$(top_srcdir)/src -I$(top_srcdir)/src/libdvdread
+AM_CPPFLAGS = -DDVDNAV_COMPILE -I$(top_srcdir)/src
 
 DVDNAV_LIB = $(top_builddir)/src/libdvdnav.la
 
 noinst_PROGRAMS = menus
 
 menus_SOURCES = menus.c
-menus_LDFLAGS = -L$(top_srcdir)/src/
+menus_LDFLAGS = -L$(top_srcdir)/src/ -ldvdread
 menus_LDADD   = $(DVDNAV_LIB)
 
 $(DVDNAV_LIB):

Modified: trunk/libdvdnav/msvc/libdvdnav.dsp
==============================================================================
--- trunk/libdvdnav/msvc/libdvdnav.dsp	(original)
+++ trunk/libdvdnav/msvc/libdvdnav.dsp	Sun Jun  8 11:12:14 2008
@@ -45,7 +45,7 @@ LINK32=link.exe
 # ADD LINK32 /machine:IX86
 MTL=midl.exe
 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /YX /FD /c
-# ADD CPP /nologo /W3 /GX /O2 /I "..\..\libdvdcss\src" /I "." /I "include" /I "contrib/dirent" /I "include/pthreads" /I "../../libdvdcss" /I ".." /I "../src" /I "../src/dvdread" /I "../src/vm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "DVDNAV_COMPILE" /D "HAVE_CONFIG_H" /YX /FD /c
+# ADD CPP /nologo /W3 /GX /O2 /I "..\..\libdvdcss\src" /I "." /I "include" /I "contrib/dirent" /I "include/pthreads" /I "../../libdvdcss" /I ".." /I "../src" /I "../src/vm" /D "WIN32" /D "NDEBUG" /D "_MBCS" /D "_LIB" /D "DVDNAV_COMPILE" /D "HAVE_CONFIG_H" /YX /FD /c
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
 # ADD RSC /l 0x409 /d "NDEBUG"
 BSC32=bscmake.exe
@@ -79,7 +79,7 @@ LINK32=link.exe
 # SUBTRACT LINK32 /pdb:none /nodefaultlib
 MTL=midl.exe
 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /D "_LIB" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "contrib/dirent" /I "include/pthreads" /I "../../libdvdcss" /I "../src" /I "." /I ".." /I "../src/dvdread" /I "../src/vm" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "DVDNAV_COMPILE" /D "HAVE_CONFIG_H" /FR"Debug/libdvdnav/" /Fp"Debug/libdvdnav/libdvdnav.pch" /YX /Fo"Debug/libdvdnav/" /Fd"Debug/libdvdnav/" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /ZI /Od /I "include" /I "contrib/dirent" /I "include/pthreads" /I "../../libdvdcss" /I "../src" /I "." /I ".." /I "../src/vm" /D "WIN32" /D "_DEBUG" /D "_LIB" /D "DVDNAV_COMPILE" /D "HAVE_CONFIG_H" /FR"Debug/libdvdnav/" /Fp"Debug/libdvdnav/libdvdnav.pch" /YX /Fo"Debug/libdvdnav/" /Fd"Debug/libdvdnav/" /FD /GZ /c
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
 # ADD RSC /l 0x409 /d "_DEBUG"
 BSC32=bscmake.exe
@@ -109,18 +109,6 @@ SOURCE=..\src\vm\decoder.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\dvdread\dvd_input.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\dvdread\dvd_reader.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\dvdread\dvd_udf.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\dvdnav.c
 # End Source File
 # Begin Source File
@@ -129,26 +117,6 @@ SOURCE=..\src\highlight.c
 # End Source File
 # Begin Source File
 
-SOURCE=..\src\dvdread\ifo_print.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\dvdread\ifo_read.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\dvdread\md5.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\dvdread\nav_print.c
-# End Source File
-# Begin Source File
-
-SOURCE=..\src\dvdread\nav_read.c
-# End Source File
-# Begin Source File
-
 SOURCE=..\src\navigation.c
 # End Source File
 # Begin Source File

Modified: trunk/libdvdnav/src/Makefile.am
==============================================================================
--- trunk/libdvdnav/src/Makefile.am	(original)
+++ trunk/libdvdnav/src/Makefile.am	Sun Jun  8 11:12:14 2008
@@ -1,11 +1,11 @@
 include $(top_srcdir)/misc/Makefile.common
 
-SUBDIRS = libdvdread vm
+SUBDIRS = vm
 
 includedir = ${prefix}/include/dvdnav
 
 AM_CPPFLAGS = -DDVDNAV_COMPILE $(THREAD_CFLAGS) \
-	-I$(top_srcdir)/src/libdvdread -I$(top_srcdir)/src/vm
+	-I$(top_srcdir)/src/vm
 
 EXTRA_DIST = README.MAP FELLOWSHIP.map
 
@@ -17,8 +17,7 @@ libdvdnav_la_SOURCES = dvdnav.c \
 	dvdnav_internal.h read_cache.h remap.h
 
 libdvdnav_la_LIBADD = $(THREAD_LIBS) \
-	$(top_builddir)/src/libdvdread/libdvdread.la \
-	$(top_builddir)/src/vm/libdvdvm.la
+	$(top_builddir)/src/vm/libdvdvm.la -ldvdread
 
 libdvdnav_la_LDFLAGS = \
 	-version-info $(DVDNAV_LT_CURRENT):$(DVDNAV_LT_REVISION):$(DVDNAV_LT_AGE) \

Modified: trunk/libdvdnav/src/vm/Makefile.am
==============================================================================
--- trunk/libdvdnav/src/vm/Makefile.am	(original)
+++ trunk/libdvdnav/src/vm/Makefile.am	Sun Jun  8 11:12:14 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/libdvdread
+	-I$(top_srcdir)/src
 
 noinst_LTLIBRARIES = libdvdvm.la
 

