diff options
| -rw-r--r-- | Makefile.am | 10 | ||||
| -rw-r--r-- | k9Mplayer/Makefile.am | 2 | ||||
| -rw-r--r-- | k9author/Makefile.am | 2 | ||||
| -rw-r--r-- | k9decmpeg/Makefile.am | 2 | ||||
| -rw-r--r-- | k9devices/Makefile.am | 2 | ||||
| -rw-r--r-- | k9vamps/Makefile.am | 2 | ||||
| -rw-r--r-- | libdvdnav/Makefile.am | 2 | ||||
| -rw-r--r-- | libk9copy/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 4 |
9 files changed, 10 insertions, 18 deletions
diff --git a/Makefile.am b/Makefile.am index a7dae17..6ed4cf7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = doc dvdread libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \ +SUBDIRS = doc libdvdnav k9Mplayer libk9copy k9author k9decmpeg k9devices k9vamps \ po src $(top_srcdir)/configure.in: configure.in.in $(top_srcdir)/subdirs @@ -29,11 +29,3 @@ dist-hook: AM_CXXFLAGS = -O0 -g3 - - - - - - - -INCLUDES = -I$(top_srcdir)/dvdread diff --git a/k9Mplayer/Makefile.am b/k9Mplayer/Makefile.am index b037c99..c72b9e1 100644 --- a/k9Mplayer/Makefile.am +++ b/k9Mplayer/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(all_includes) +INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(all_includes) METASOURCES = AUTO noinst_LTLIBRARIES = libk9mplayer.la diff --git a/k9author/Makefile.am b/k9author/Makefile.am index a558d36..618df34 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$(top_srcdir)/dvdread -I$(top_srcdir)/k9devices \ +INCLUDES = -I/usr/include/dvdread -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 998689a..1d8911f 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$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \ +INCLUDES = -I/usr/include/dvdread -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 a20f2d6..9156ef7 100644 --- a/k9devices/Makefile.am +++ b/k9devices/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \ +INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/libk9copy $(DBUS_INCS) \ $(HAL_INCS) $(K3B_INCS) -I$(includedir) $(all_includes) METASOURCES = AUTO libk9devices_la_LDFLAGS = $(all_libraries) diff --git a/k9vamps/Makefile.am b/k9vamps/Makefile.am index d432954..42c45fa 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$(top_srcdir)/dvdread -I$(top_srcdir)/k9vamps \ +INCLUDES = -I/usr/include/dvdread -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 13baa2d..4af5610 100644 --- a/libdvdnav/Makefile.am +++ b/libdvdnav/Makefile.am @@ -11,4 +11,4 @@ noinst_HEADERS = common.h dvdread.h -INCLUDES = -I$(top_srcdir)/dvdread +INCLUDES = -I/usr/include/dvdread diff --git a/libk9copy/Makefile.am b/libk9copy/Makefile.am index bf76bbc..60b0855 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$(top_srcdir)/dvdread -I$(top_srcdir)/k9decmpeg \ +INCLUDES = -I/usr/include/dvdread -I$(top_srcdir)/k9decmpeg \ -I$(top_srcdir)/k9vamps -I$(top_srcdir)/libdvdnav libk9copy_la_LDFLAGS = $(all_libraries) diff --git a/src/Makefile.am b/src/Makefile.am index 63660b3..d3c0112 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,5 +1,5 @@ # set the include path for X, qt and KDE -INCLUDES = -I$(top_srcdir)/dvdread -I$(top_srcdir)/k9Mplayer \ +INCLUDES = -I/usr/include/dvdread -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) @@ -35,7 +35,7 @@ k9copy_LDADD = $(top_builddir)/k9Mplayer/libk9mplayer.la \ $(top_builddir)/k9author/libk9author.la $(top_builddir)/k9decmpeg/libk9decmpeg.la \ $(top_builddir)/k9devices/libk9devices.la $(top_builddir)/k9vamps/libk9vamps.la \ $(top_builddir)/libdvdnav/libk9dvdnav.la $(top_builddir)/libk9copy/libk9copy.la \ - $(top_builddir)/dvdread/libdvdread.la $(LIB_TDEUI) -ltdemdi $(LIBDL) + $(LIB_TDEUI) -ltdemdi $(LIBDL) # this is where the desktop file will go shelldesktopdir = $(kde_appsdir)/Utilities |