Mercurial > libdvdnav.hg

diff Makefile.am @ 379:5f2ccadb2123 src

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
finally removed libdvdread; new build build system temporarily broken: will fix in next commit
author nicodvb
date Sun, 08 Jun 2008 09:12:14 +0000
parents 62dd6af82d7b
children 04e184087151
line wrap: on
line diff
--- a/Makefile.am	Sun Jun 08 09:03:10 2008 +0000
+++ b/Makefile.am	Sun Jun 08 09:12:14 2008 +0000
@@ -1,11 +1,11 @@
 include $(top_srcdir)/misc/Makefile.common
 
-SUBDIRS = libdvdread vm
+SUBDIRS = vm
 
 includedir = ${prefix}/include/dvdnav
 
 AM_CPPFLAGS = -DDVDNAV_COMPILE $(THREAD_CFLAGS) \
-	-I$(top_srcdir)/src/libdvdread -I$(top_srcdir)/src/vm
+	-I$(top_srcdir)/src/vm
 
 EXTRA_DIST = README.MAP FELLOWSHIP.map
 
@@ -17,8 +17,7 @@
 	dvdnav_internal.h read_cache.h remap.h
 
 libdvdnav_la_LIBADD = $(THREAD_LIBS) \
-	$(top_builddir)/src/libdvdread/libdvdread.la \
-	$(top_builddir)/src/vm/libdvdvm.la
+	$(top_builddir)/src/vm/libdvdvm.la -ldvdread
 
 libdvdnav_la_LDFLAGS = \
 	-version-info $(DVDNAV_LT_CURRENT):$(DVDNAV_LT_REVISION):$(DVDNAV_LT_AGE) \