Author: nicodvb Date: Sun Aug 5 22:27:59 2007 New Revision: 954 Log: 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) Modified: trunk/libdvdnav/misc/dvdnav-config.in trunk/libdvdnav/src/dvdnav.h trunk/libdvdnav/src/dvdread/Makefile.am Modified: trunk/libdvdnav/misc/dvdnav-config.in ============================================================================== --- trunk/libdvdnav/misc/dvdnav-config.in (original) +++ trunk/libdvdnav/misc/dvdnav-config.in Sun Aug 5 22:27:59 2007 @@ -76,11 +76,11 @@ if test "$echo_exec_prefix" = "yes"; the fi if test "$echo_cflags" = "yes"; then - echo -I@includedir@ -I@includedir@/dvdnav @THREAD_CFLAGS@ + echo -I@includedir@ -I@includedir@/dvdnav -I@includedir@/dvdread @THREAD_CFLAGS@ fi if test "$echo_libs" = "yes"; then - echo -L@libdir@ -ldvdnav @THREAD_LIBS@ + echo -L@libdir@ -ldvdnav -ldvdread @THREAD_LIBS@ fi if test "$echo_minilibs" = "yes"; then Modified: trunk/libdvdnav/src/dvdnav.h ============================================================================== --- trunk/libdvdnav/src/dvdnav.h (original) +++ trunk/libdvdnav/src/dvdnav.h Sun Aug 5 22:27:59 2007 @@ -37,15 +37,9 @@ extern "C" { #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 Modified: trunk/libdvdnav/src/dvdread/Makefile.am ============================================================================== --- trunk/libdvdnav/src/dvdread/Makefile.am (original) +++ trunk/libdvdnav/src/dvdread/Makefile.am Sun Aug 5 22:27:59 2007 @@ -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_SOURCES = dvd_reader.c nav 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