Mercurial > libdvdnav.hg
changeset 368:62dd6af82d7b src
adapted the tree to the dvdread->libdvdread transition
| author | nicodvb |
|---|---|
| date | Sat, 31 May 2008 12:34:25 +0000 |
| parents | 1274107d0eac |
| children | 1ab4b25afca3 |
| files | Makefile.am dvdnav.h libdvdread/Makefile.am libdvdread/ifo_print.h vm/Makefile.am |
| diffstat | 5 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.am Sat May 31 12:29:19 2008 +0000 +++ b/Makefile.am Sat May 31 12:34:25 2008 +0000 @@ -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 @@ 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 = \
--- a/dvdnav.h Sat May 31 12:29:19 2008 +0000 +++ b/dvdnav.h Sat May 31 12:34:25 2008 +0000 @@ -37,9 +37,9 @@ #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
--- a/libdvdread/Makefile.am Sat May 31 12:29:19 2008 +0000 +++ b/libdvdread/Makefile.am Sat May 31 12:34:25 2008 +0000 @@ -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
--- a/libdvdread/ifo_print.h Sat May 31 12:29:19 2008 +0000 +++ b/libdvdread/ifo_print.h Sat May 31 12:34:25 2008 +0000 @@ -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);
--- a/vm/Makefile.am Sat May 31 12:29:19 2008 +0000 +++ b/vm/Makefile.am Sat May 31 12:34:25 2008 +0000 @@ -3,7 +3,7 @@ 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