Mercurial > libdvdnav.hg

changeset 381:04e184087151 src

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
now autotools use dvdread-config, too. Based on a patch by Dan Nicholson
author nicodvb
date Sat, 14 Jun 2008 12:33:21 +0000
parents 3e3119415275
children 5a28a534ecf9
files Makefile.am vm/Makefile.am
diffstat 2 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile.am	Wed Jun 11 18:06:43 2008 +0000
+++ b/Makefile.am	Sat Jun 14 12:33:21 2008 +0000
@@ -4,7 +4,7 @@
 
 includedir = ${prefix}/include/dvdnav
 
-AM_CPPFLAGS = -DDVDNAV_COMPILE $(THREAD_CFLAGS) \
+AM_CPPFLAGS = -DDVDNAV_COMPILE $(THREAD_CFLAGS) $(DVDREAD_CFLAGS) \
 	-I$(top_srcdir)/src/vm
 
 EXTRA_DIST = README.MAP FELLOWSHIP.map
@@ -16,8 +16,8 @@
 	searching.c settings.c remap.c \
 	dvdnav_internal.h read_cache.h remap.h
 
-libdvdnav_la_LIBADD = $(THREAD_LIBS) \
-	$(top_builddir)/src/vm/libdvdvm.la -ldvdread
+libdvdnav_la_LIBADD = $(THREAD_LIBS) $(DVDREAD_LIBS) \
+	$(top_builddir)/src/vm/libdvdvm.la
 
 libdvdnav_la_LDFLAGS = \
 	-version-info $(DVDNAV_LT_CURRENT):$(DVDNAV_LT_REVISION):$(DVDNAV_LT_AGE) \
--- a/vm/Makefile.am	Wed Jun 11 18:06:43 2008 +0000
+++ b/vm/Makefile.am	Sat Jun 14 12:33:21 2008 +0000
@@ -2,7 +2,7 @@
 
 includedir = ${prefix}/include/dvdnav
 
-AM_CPPFLAGS = -DDVDNAV_COMPILE $(THREAD_CFLAGS) \
+AM_CPPFLAGS = -DDVDNAV_COMPILE $(THREAD_CFLAGS) $(DVDREAD_CFLAGS) \
 	-I$(top_srcdir)/src
 
 noinst_LTLIBRARIES = libdvdvm.la