Browse Source

Use system dvdread headers

This resolves Bug 1608
pull/1/head
Francois Andriot 9 years ago committed by Timothy Pearson
parent
commit
71c6fa0732
  1. 10
      Makefile.am
  2. 2
      k9Mplayer/Makefile.am
  3. 2
      k9author/Makefile.am
  4. 2
      k9decmpeg/Makefile.am
  5. 2
      k9devices/Makefile.am
  6. 2
      k9vamps/Makefile.am
  7. 2
      libdvdnav/Makefile.am
  8. 2
      libk9copy/Makefile.am
  9. 4
      src/Makefile.am

10
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

2
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

2
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)

2
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

2
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)

2
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

2
libdvdnav/Makefile.am

@ -11,4 +11,4 @@ noinst_HEADERS = common.h dvdread.h
INCLUDES = -I$(top_srcdir)/dvdread
INCLUDES = -I/usr/include/dvdread

2
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)

4
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

Loading…
Cancel
Save