Fixes make building in OS X:

- Switches default (snapshot) make target to use the Deployment Xcode target
- Makes it possible to jam contribs using make in OS X like is done in Linux
- This means no universal binaries from make, unless "make release" is used. That's the only time it uses the contrib download script. The snapshot target builds contribs locally.

To sum up: this now means that on a Mac, using:
make
....should be functionally equivalent to:
make clean; ./configure; ./jam

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1430 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/Makefile b/Makefile
index fc28d678713dce593d80aa5b80e64f514602a051..42a37fde6defbafba4edc99cd55b3b6c5cfa9723 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -22,8 +22,11 @@ dev: clean internal
 app:\r
        (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -target libhb -target HandBrake -target HandBrakeCLI -configuration UB  OTHER_CFLAGS_QUOTED_1="-DHB_VERSION=\\\"$(HB_VERSION)\\\" -DHB_BUILD=$(HB_BUILD) " build | sed '/^$$/d'  )\r
 \r
-snapshot-app:\r
-       (./DownloadMacOsXContribBinaries.sh ; cd macosx ; defaults write "$(FULL_PATH)"/macosx/HandBrake CFBundleGetInfoString '$(SNAP_HB_VERSION)' ; defaults write "$(FULL_PATH)"/macosx/HandBrake CFBundleShortVersionString '$(SNAP_HB_VERSION)' ;  defaults write "$(FULL_PATH)"/macosx/HandBrake CFBundleVersion '"$(SNAP_HB_BUILD)"' ; plutil -convert xml1 "$(FULL_PATH)"/macosx/HandBrake.plist ; xcodebuild -target libhb -target HandBrake -target HandBrakeCLI -configuration UB  OTHER_CFLAGS_QUOTED_1="-g -HB_BUILD="$(SNAP_HB_BUILD)" -HB_VERSION=\\\"$(SNAP_HB_VERSION)\\\" -DHB_BUILD="$(SNAP_HB_BUILD)" -DHB_VERSION=\\\"$(SNAP_HB_VERSION)\\\" -CURRENT_PROJECT_VERSION=\\\"$(SNAP_HB_VERSION)\\\" " build | sed '/^$$/d'  )\r
+contrib/.contrib:\r
+       @$(MAKE) --no-print-directory -C contrib all\r
+\r
+snapshot-app: contrib/.contrib\r
+       ( cd macosx ; defaults write "$(FULL_PATH)"/macosx/HandBrake CFBundleGetInfoString '$(SNAP_HB_VERSION)' ; defaults write "$(FULL_PATH)"/macosx/HandBrake CFBundleShortVersionString '$(SNAP_HB_VERSION)' ;  defaults write "$(FULL_PATH)"/macosx/HandBrake CFBundleVersion '"$(SNAP_HB_BUILD)"' ; plutil -convert xml1 "$(FULL_PATH)"/macosx/HandBrake.plist ; xcodebuild -target libhb -target HandBrake -target HandBrakeCLI -configuration Deployment  OTHER_CFLAGS_QUOTED_1="-g -HB_BUILD="$(SNAP_HB_BUILD)" -HB_VERSION=\\\"$(SNAP_HB_VERSION)\\\" -DHB_BUILD="$(SNAP_HB_BUILD)" -DHB_VERSION=\\\"$(SNAP_HB_VERSION)\\\" -CURRENT_PROJECT_VERSION=\\\"$(SNAP_HB_VERSION)\\\" " build | sed '/^$$/d'  )\r
 \r
 app-chunky:\r
        (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB  OTHER_CFLAGS_QUOTED_1="-DHB_VERSION=\\\"$(HB_VERSION)\\\" -DHB_BUILD=$(HB_BUILD) " build | sed '/^$$/d'  )\r

diff --git a/contrib/Makefile b/contrib/Makefile
index 33baec42c7ca51aea9ef010f2fbb1d7777d4c9d8..24d6ee243c4c29686fee0fa71a3615800492cc2a 100644 (file)
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -5,8 +5,16 @@ SYSTEM = $(shell uname -s)
 # Special case for Mac OS X: everything is handled from the Xcode project\r
 ifeq ($(SYSTEM),Darwin)\r
 \r
-all:\r
-       ( echo "MacOs X doesn't use this makefile, to build the contrib please use ../jam" ; false )\r
+all:   .contrib\r
+\r
+.contrib:\r
+       ( cd .. ; ./configure ; cd contrib ; cp -f ../config.jam . ; ../jam )\r
+\r
+clean: \r
+       ( echo "Do a make mrproper to remove the contrib libraries )\r
+\r
+mrproper: \r
+       (rm -rf lib ; rm -rf include )\r
 \r
 endif\r
 \r