Missed trunk makefile when checking in 1109

git-svn-id: svn://localhost/HandBrake/trunk@1129 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/Makefile b/Makefile
index 00d9677..8d9f1e2 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,95 +1,95 @@
-include Makefile.config
-
-SYSTEM = $(shell uname -s)
-
-# Special case for Mac OS X: everything is handled from the Xcode project
-
-ifeq ($(SYSTEM),Darwin)
-
-all:    clean app
-
-all-chunky:    clean app-chunky
-
-test:  clean cli
-
-dev:   clean internal
-
-app:
-       (./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' ; cd .. ; ./macosx/localize.sh HandBrake.app $(HB_VERSION) $(HB_BUILD) UB )
-
-app-chunky:
-       (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB  OTHER_CFLAGS_QUOTED_1="-DHB_VERSION=\\\"$(HB_VERSION)\\\" -DHB_BUILD=$(HB_BUILD) " build | sed '/^$$/d' ; cd .. ; ./macosx/localize.sh HandBrake.app $(HB_VERSION) $(HB_BUILD) UB )
-
-cli:
-       (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -target libhb -target HandBrakeCLI -configuration UB  OTHER_CFLAGS_QUOTED_1="-DHB_VERSION=\\\"$(HB_VERSION)\\\" -DHB_BUILD=$(HB_BUILD) " build | sed '/^$$/d' )
-
-clean:
-       (cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' )
-
-mrproper:
-       (rm -rf contrib/*tar.gz contrib/include contrib/lib contrib/DarwinContribVersion.txt ; cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' )
-
-release:
-       (rm -rf HandBrake HandBrake*dmg ; mkdir -p HandBrake/api HandBrake/doc HandBrake/doc/pdf; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/doc ; cp -rp pdf/ HandBrake/doc/pdf/ ; cp -rp HandBrake.app HandBrake ; cp -rp libhb/libhb.dylib HandBrake/api ; cp -rp libhb/hb.h libhb/common.h libhb/ports.h HandBrake/api ; cp -rp HandBrakeCLI HandBrake ; hdiutil create -srcfolder HandBrake  -format UDZO HandBrake-$(HB_VERSION)-MacOS_UB.dmg ; rm -rf HandBrake )
-
-gui-release:
-       (rm -rf HandBrake HandBrake*GUI_UB.dmg ; mkdir -p HandBrake/docs ; cp AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/docs ; cp -rp HandBrake.app HandBrake  ; hdiutil create -srcfolder HandBrake  -format UDBZ HandBrake-$(HB_VERSION)-MacOSX.4_GUI_UB.dmg ; rm -rf HandBrake )
-
-cli-release:
-       (rm -rf HandBrake HandBrake*CLI_UB.dmg ; mkdir -p HandBrake/docs ; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/docs ; cp -rp HandBrakeCLI HandBrake ; hdiutil create -srcfolder HandBrake  -format UDZO HandBrake-$(HB_VERSION)-MacOSX.3_CLI_UB.dmg ; rm -rf HandBrake )
-
-endif
-
-ifeq ($(SYSTEM),Linux)
-
-all:   contrib/.contrib libhb/libhb.a HandBrakeCLI
-       (rm -rf HandBrake HandBrake*.tar.gz ; mkdir -p HandBrake/api HandBrake/doc; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/doc ;  cp -rp libhb/libhb.so HandBrake/api ; cp -rp libhb/hb.h libhb/common.h libhb/ports.h HandBrake/api ; cp -rp HandBrakeCLI HandBrake ; tar zcvf HandBrake-$(HB_VERSION)_i386.tar.gz HandBrake ; rm -rf HandBrake )
-
-
-contrib/.contrib:
-       @$(MAKE) --no-print-directory -C contrib all
-
-libhb/libhb.a:
-       @$(MAKE) --no-print-directory -C libhb all
-
-HandBrakeCLI:
-       @$(MAKE) --no-print-directory -C test all
-
-clean:
-       @$(MAKE) --no-print-directory -C libhb clean
-       @$(MAKE) --no-print-directory -C test clean
-
-mrproper: clean
-       @$(MAKE) --no-print-directory -C contrib mrproper
-
-endif
-
-ifeq ($(SYSTEM),CYGWIN_NT-5.1)
-
-all:    contrib/.contrib libhb/libhb.a 
-
-
-app:
-       (./DownloadCygWinContribBinaries.sh)
-HandbrakeCLI: app libhb/libhb.a
-
-
-contrib/.contrib:
-       @$(MAKE) --no-print-directory -C contrib all
-
-libhb/libhb.a:
-       @$(MAKE) --no-print-directory -C libhb all
-
-HandbrakeCLI:
-       @$(MAKE) --no-print-directory -C test all
-       
-
-       
-clean:
-       @$(MAKE) --no-print-directory -C libhb clean
-       @$(MAKE) --no-print-directory -C test clean
-
-mrproper: clean
-       @$(MAKE) --no-print-directory -C contrib mrproper
-
-endif
+include Makefile.config\r
+\r
+SYSTEM = $(shell uname -s)\r
+\r
+# Special case for Mac OS X: everything is handled from the Xcode project\r
+\r
+ifeq ($(SYSTEM),Darwin)\r
+\r
+all:    clean app\r
+\r
+all-chunky:    clean app-chunky\r
+\r
+test:  clean cli\r
+\r
+dev:   clean internal\r
+\r
+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' ; cd .. ; ./macosx/localize.sh HandBrake.app $(HB_VERSION) $(HB_BUILD) UB )\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' ; cd .. ; ./macosx/localize.sh HandBrake.app $(HB_VERSION) $(HB_BUILD) UB )\r
+\r
+cli:\r
+       (./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -target libhb -target HandBrakeCLI -configuration UB  OTHER_CFLAGS_QUOTED_1="-DHB_VERSION=\\\"$(HB_VERSION)\\\" -DHB_BUILD=$(HB_BUILD) " build | sed '/^$$/d' )\r
+\r
+clean:\r
+       (cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' )\r
+\r
+mrproper:\r
+       (rm -rf contrib/*tar.gz contrib/include contrib/lib contrib/DarwinContribVersion.txt ; cd macosx ; xcodebuild -alltargets -configuration UB clean | sed '/^$$/d' )\r
+\r
+release:\r
+       (rm -rf HandBrake HandBrake*dmg ; mkdir -p HandBrake/api HandBrake/doc HandBrake/doc/pdf; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/doc ; cp -rp pdf/ HandBrake/doc/pdf/ ; cp -rp HandBrake.app HandBrake ; cp -rp libhb/libhb.dylib HandBrake/api ; cp -rp libhb/hb.h libhb/common.h libhb/ports.h HandBrake/api ; cp -rp HandBrakeCLI HandBrake ; hdiutil create -srcfolder HandBrake  -format UDZO HandBrake-$(HB_VERSION)-MacOS_UB.dmg ; rm -rf HandBrake )\r
+\r
+gui-release:\r
+       (rm -rf HandBrake HandBrake*GUI_UB.dmg ; mkdir -p HandBrake/docs ; cp AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/docs ; cp -rp HandBrake.app HandBrake  ; hdiutil create -srcfolder HandBrake  -format UDBZ HandBrake-$(HB_VERSION)-MacOSX.4_GUI_UB.dmg ; rm -rf HandBrake )\r
+\r
+cli-release:\r
+       (rm -rf HandBrake HandBrake*CLI_UB.dmg ; mkdir -p HandBrake/docs ; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/docs ; cp -rp HandBrakeCLI HandBrake ; hdiutil create -srcfolder HandBrake  -format UDZO HandBrake-$(HB_VERSION)-MacOSX.3_CLI_UB.dmg ; rm -rf HandBrake )\r
+\r
+endif\r
+\r
+ifeq ($(SYSTEM),Linux)\r
+\r
+all:   contrib/.contrib libhb/libhb.a HandBrakeCLI\r
+       (rm -rf HandBrake HandBrake*.tar.gz ; mkdir -p HandBrake/api HandBrake/doc; cp test/BUILDSHARED AUTHORS BUILD COPYING CREDITS NEWS THANKS TRANSLATIONS HandBrake/doc ;  cp -rp libhb/libhb.so HandBrake/api ; cp -rp libhb/hb.h libhb/common.h libhb/ports.h HandBrake/api ; cp -rp HandBrakeCLI HandBrake ; tar zcvf HandBrake-$(HB_VERSION)_i386.tar.gz HandBrake ; rm -rf HandBrake )\r
+\r
+\r
+contrib/.contrib:\r
+       @$(MAKE) --no-print-directory -C contrib all\r
+\r
+libhb/libhb.a:\r
+       @$(MAKE) --no-print-directory -C libhb all\r
+\r
+HandBrakeCLI:\r
+       @$(MAKE) --no-print-directory -C test all\r
+\r
+clean:\r
+       @$(MAKE) --no-print-directory -C libhb clean\r
+       @$(MAKE) --no-print-directory -C test clean\r
+\r
+mrproper: clean\r
+       @$(MAKE) --no-print-directory -C contrib mrproper\r
+\r
+endif\r
+\r
+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)\r
+\r
+all:    contrib/.contrib libhb/libhb.a \r
+\r
+\r
+app:\r
+       (./DownloadCygWinContribBinaries.sh)\r
+HandbrakeCLI: app libhb/libhb.a\r
+\r
+\r
+contrib/.contrib:\r
+       @$(MAKE) --no-print-directory -C contrib all\r
+\r
+libhb/libhb.a:\r
+       @$(MAKE) --no-print-directory -C libhb all\r
+\r
+HandbrakeCLI:\r
+       @$(MAKE) --no-print-directory -C test all\r
+       \r
+\r
+       \r
+clean:\r
+       @$(MAKE) --no-print-directory -C libhb clean\r
+       @$(MAKE) --no-print-directory -C test clean\r
+\r
+mrproper: clean\r
+       @$(MAKE) --no-print-directory -C contrib mrproper\r
+\r
+endif\r