changeset 307:5039307a3e7c src

dvdread is now built as independent library and installed system-wide alongside libdvdnav (it's intended to be a replacement for ogle's dvdread that is broken)
author nicodvb
date Sun, 05 Aug 2007 20:27:59 +0000
parents 9aea3dbbfa91
children 494842974e55
files dvdnav.h dvdread/Makefile.am
diffstat 2 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/dvdnav.h	Thu Aug 02 21:58:59 2007 +0000
+++ b/dvdnav.h	Sun Aug 05 20:27:59 2007 +0000
@@ -37,15 +37,9 @@
 
 #ifndef DVDNAV_COMPILE
 #  include <dvdnav/dvd_types.h>
-#ifdef DVDNAV_USES_EXTERNAL_DVDREAD
 #  include <dvdread/dvd_reader.h>
 #  include <dvdread/nav_types.h>
 #  include <dvdread/ifo_types.h> /* For vm_cmd_t */
-#else
-#  include <dvdnav/dvd_reader.h>
-#  include <dvdnav/nav_types.h>
-#  include <dvdnav/ifo_types.h> /* For vm_cmd_t */
-#endif
 #  include <dvdnav/dvdnav_events.h>
 #endif
 
--- a/dvdread/Makefile.am	Thu Aug 02 21:58:59 2007 +0000
+++ b/dvdread/Makefile.am	Sun Aug 05 20:27:59 2007 +0000
@@ -1,10 +1,10 @@
 include $(top_srcdir)/misc/Makefile.common
 
-includedir = ${prefix}/include/dvdnav
+includedir = ${prefix}/include/dvdread
 
 AM_CPPFLAGS = -DDVDNAV_COMPILE -I$(top_srcdir)/src/vm
 
-noinst_LTLIBRARIES = libdvdread.la
+lib_LTLIBRARIES = libdvdread.la
 
 libdvdread_la_SOURCES = dvd_reader.c nav_read.c ifo_read.c \
 	dvd_input.c dvd_udf.c md5.c nav_print.c ifo_print.c \
@@ -12,5 +12,8 @@
 
 libdvdread_la_LIBADD = $(DYNAMIC_LD_LIBS)
 
+libdvdread_la_LDFLAGS = -version-info $(DVDNAV_LT_CURRENT):$(DVDNAV_LT_REVISION):$(DVDNAV_LT_AGE) \
+	-export-symbols-regex "(^dvd.*|^nav.*|^ifo.*|^DVD.*)"
+
 include_HEADERS = dvd_reader.h nav_read.h ifo_read.h \
 	nav_print.h ifo_print.h ifo_types.h nav_types.h