From b5f2ba10d0463691c969d8e6771b7c96bddf18af Mon Sep 17 00:00:00 2001 From: frace Date: Fri, 4 Mar 2016 01:24:34 +0100 Subject: bootstrap.mk pointing to lib/libdvd/libdvdread Current git master fails to build due to bootstrap.mk still pointing to lib/libdvd/libdvdread. Related: + http://trac.kodi.tv/ticket/16616#no2 + https://bugs.gentoo.org/show_bug.cgi?id=576252 --- bootstrap.mk | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'bootstrap.mk') diff --git a/bootstrap.mk b/bootstrap.mk index 29f7b7f2ba..6b93e7e5b7 100644 --- a/bootstrap.mk +++ b/bootstrap.mk @@ -2,24 +2,9 @@ BOOTSTRAP_SUBDIRS += configure.ac BOOTSTRAP_SUBDIRS += lib/cpluff/configure.ac BOOTSTRAP_SUBDIRS += lib/gtest/configure.ac -ifneq ($(wildcard lib/libdvd/libdvdcss/configure.ac),) -BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac -DVD_CSS=lib/libdvd/libdvdcss/configure -endif -BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdread/configure.ac -BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdnav/configure.ac - -ifneq ($(wildcard pvr-addons/Makefile.am),) -BOOTSTRAP_SUBDIRS += pvr-addons/configure.ac -endif - BOOTSTRAP_TARGETS=$(basename $(BOOTSTRAP_SUBDIRS)) all: $(BOOTSTRAP_TARGETS) -#preserve order for libdvd. dvdcss (if present) -> dvdread -> dvdnav. -lib/libdvd/libdvdread/configure: $(DVD_CSS) -lib/libdvd/libdvdnav/configure: lib/libdvd/libdvdread/configure - %: %.ac autoreconf -vif $(@D) -@rm -rf $(@D)/autom4te.cache -- cgit v1.2.3