Fix incorrect use of dvdread includes.

It seems that the library has been designed for use includes in the form
"#include <dvdread/...>" while we used includes without the "dvdread/" prefix.
This caused that instead of using the standard path detected from pkg-config,
the expected path had to be added to to -I flag.

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 9f7c0362e26f62dc81769ab55a89e32c3c9a268d)

11 files changed, 19 insertions, 19 deletions

diff --git a/k9Mplayer/Makefile.am b/k9Mplayer/Makefile.am
index c72b9e1..803128c 100644
--- a/k9Mplayer/Makefile.am
+++ b/k9Mplayer/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(all_includes)
+INCLUDES = -I$(top_srcdir)/libk9copy $(all_includes)
 METASOURCES = AUTO
 
 noinst_LTLIBRARIES = libk9mplayer.la
diff --git a/k9author/Makefile.am b/k9author/Makefile.am
index 91d406e..4c9a92c 100644
--- a/k9author/Makefile.am
+++ b/k9author/Makefile.am
@@ -14,5 +14,5 @@ noinst_HEADERS = k9avidecode.h k9avifile.h k9canvasselection.h k9chapteredit.h \
 	k9import.h k9importfiles.h k9lvitemimport.h k9menu.h k9menubutton.h k9menuedit.h \
 	k9menueditor.h k9newdvd.h k9newtitle.h k9title.h
 libk9author_la_LIBADD = $(top_builddir)/libk9copy/libk9copy.la $(LIB_TDEUI)
-INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9devices \
+INCLUDES = -I$(top_srcdir)/k9devices \
 	-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libk9copy -I$(top_srcdir)/src $(all_includes)
diff --git a/k9decmpeg/Makefile.am b/k9decmpeg/Makefile.am
index 1d8911f..c47f0e4 100644
--- a/k9decmpeg/Makefile.am
+++ b/k9decmpeg/Makefile.am
@@ -12,7 +12,7 @@ libk9decmpeg_la_SOURCES = alloc.cpp attributes.h bswap.h convert_internal.h \
 	motion_comp_altivec.cpp motion_comp.cpp motion_comp_mmx.cpp motion_comp_vis.cpp mpeg2convert.h \
 	mpeg2.h mpeg2_internal.h rgb.cpp rgb_mmx.cpp rgb_vis.cpp slice.cpp tendra.h \
 	uyvy.cpp video_out.h vis.h vlc.h k9decodethread.cpp k9plaympeg2.cpp
-INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \
+INCLUDES = -I$(top_srcdir)/k9vamps \
 	-I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy
 
 noinst_HEADERS = k9decodethread.h k9plaympeg2.h
diff --git a/k9devices/Makefile.am b/k9devices/Makefile.am
index 1a7e663..59de2d4 100644
--- a/k9devices/Makefile.am
+++ b/k9devices/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(K3B_INCS) -I$(includedir) $(all_includes)
+INCLUDES = -I$(top_srcdir)/libk9copy $(K3B_INCS) -I$(includedir) $(all_includes)
 METASOURCES = AUTO
 libk9devices_la_LDFLAGS = $(all_libraries) 
 noinst_LTLIBRARIES = libk9devices.la
diff --git a/k9vamps/Makefile.am b/k9vamps/Makefile.am
index 42c45fa..00a91ce 100644
--- a/k9vamps/Makefile.am
+++ b/k9vamps/Makefile.am
@@ -7,6 +7,6 @@ libk9vamps_la_LDFLAGS = $(all_libraries)
 noinst_LTLIBRARIES = libk9vamps.la
 libk9vamps_la_SOURCES = cputest.cpp getvlc.h k9fifo.cpp k9requant.cpp \
 	k9vamps.cpp k9vamps.h putvlc.h qTable.h tcmemcpy.cpp
-INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9vamps \
+INCLUDES = -I$(top_srcdir)/k9vamps \
 	-I$(top_srcdir)/libk9copy
 noinst_HEADERS = k9requant.h ac.h k9fifo.h
diff --git a/libdvdnav/Makefile.am b/libdvdnav/Makefile.am
index 4af5610..fc96611 100644
--- a/libdvdnav/Makefile.am
+++ b/libdvdnav/Makefile.am
@@ -11,4 +11,4 @@ noinst_HEADERS = common.h dvdread.h
 
 
 
-INCLUDES = -I/usr/include/dvdread
+INCLUDES =
diff --git a/libdvdnav/common.h b/libdvdnav/common.h
index c54924e..7f88e7d 100644
--- a/libdvdnav/common.h
+++ b/libdvdnav/common.h
@@ -9,8 +9,8 @@
      #include <stdint.h>
 #endif
 
-#include "ifo_types.h"
-#include "dvd_reader.h"
-#include "ifo_read.h"
-#include "nav_read.h"
-#include "nav_types.h"
+#include <dvdread/ifo_types.h>
+#include <dvdread/dvd_reader.h>
+#include <dvdread/ifo_read.h>
+#include <dvdread/nav_read.h>
+#include <dvdread/nav_types.h>
diff --git a/libdvdnav/dvdnav_internal.h b/libdvdnav/dvdnav_internal.h
index efa8708..9bd2a66 100644
--- a/libdvdnav/dvdnav_internal.h
+++ b/libdvdnav/dvdnav_internal.h
@@ -94,7 +94,7 @@ typedef struct read_cache_s read_cache_t;
 
 /*
  * These are defined here because they are
- * not in ifo_types.h, they maybe one day 
+ * not in dvdread/ifo_types.h, they maybe one day
  */
 
 #ifndef audio_status_t
diff --git a/libk9copy/Makefile.am b/libk9copy/Makefile.am
index 60b0855..9a2bcd4 100644
--- a/libk9copy/Makefile.am
+++ b/libk9copy/Makefile.am
@@ -24,6 +24,6 @@ noinst_HEADERS = bswap.h k9audiocodecs.h k9backupdlg.h k9burndvd.h k9cell.h \
 	k9saveimage.h k9script.h k9titleencopt.h k9tools.h k9videocodecs.h
 
 
-INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9decmpeg \
+INCLUDES = -I$(top_srcdir)/k9decmpeg \
 	-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav
 libk9copy_la_LDFLAGS = $(all_libraries)
diff --git a/libk9copy/k9common.h b/libk9copy/k9common.h
index 249cf8d..c7e396a 100644
--- a/libk9copy/k9common.h
+++ b/libk9copy/k9common.h
@@ -28,11 +28,11 @@
 #ifdef __FreeBSD__
     #include <osreldate.h>
 #endif
-#include "ifo_types.h"
-#include "dvd_reader.h"
-#include "ifo_read.h"
-#include "nav_read.h"
-#include "nav_types.h"
+#include <dvdread/ifo_types.h>
+#include <dvdread/dvd_reader.h>
+#include <dvdread/ifo_read.h>
+#include <dvdread/nav_read.h>
+#include <dvdread/nav_types.h>
 
 #include <tqobject.h>
 #include <tqobjectlist.h>
diff --git a/src/Makefile.am b/src/Makefile.am
index efa34fc..5ed2714 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 # set the include path for X, qt and KDE
-INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9Mplayer \
+INCLUDES = -I$(top_srcdir)/k9Mplayer \
 	-I$(top_srcdir)/k9author -I$(top_srcdir)/k9decmpeg -I$(top_srcdir)/k9devices \
 	-I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav -I$(top_srcdir)/libk9copy -I$(includedir) $(all_includes)