diff options
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | contrib/Jamfile | 1 |
2 files changed, 3 insertions, 1 deletions
@@ -35,7 +35,7 @@ cli: libhb/hbversion.h (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -target libhb -target HandBrakeCLI -configuration UB HB_BUILD="$(HB_BUILD)" HB_VERSION="$(HB_VERSION)" build | sed '/^$$/d' ) clean: - (cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' ; rm -f libhb/hbversion.h ) + (cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' ; rm -f libhb/hbversion.h ; rm -f contrib/config.cache ) mrproper: (rm -rf libhb/hbversion.h contrib/*tar.gz contrib/include contrib/lib contrib/DarwinContribVersion.txt ; cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' ) @@ -78,6 +78,7 @@ clean: @$(MAKE) --no-print-directory -C libhb clean @$(MAKE) --no-print-directory -C test clean @rm libhb/hbversion.h + @rm -f contrib/config.cache mrproper: clean @$(MAKE) --no-print-directory -C contrib mrproper diff --git a/contrib/Jamfile b/contrib/Jamfile index 98b310bdc..b3a8545db 100644 --- a/contrib/Jamfile +++ b/contrib/Jamfile @@ -391,6 +391,7 @@ actions LibTheora { cd `dirname $(>)` && CONTRIB=`pwd` && rm -rf libtheora && (gzip -dc libtheora.tar.gz | tar xf - ) && cd libtheora && + export HAVE_PKG_CONFIG="no" && ./configure --prefix=$CONTRIB --with-ogg=$CONTRIB --with-vorbis=$CONTRIB --cache-file=$CONTRIB/config.cache --disable-shared \ --disable-oggtest --disable-vorbistest --disable-sdltest --disable-examples && $(MAKE) && $(MAKE) install && |