Set svn:eol-style=native on most text files.

Goodbye evil CRLF.


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

1 files changed, 138 insertions, 138 deletions

diff --git a/Makefile b/Makefile
index de448284e..b2849f24c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,138 +1,138 @@
-include Makefile.config

-

-SYSTEM = $(shell uname -s)

-

-# Special case for Mac OS X: everything is handled from the Xcode project

-

-#

-# Darwin

-#

-ifeq ($(SYSTEM),Darwin)

-

-snapshot:   clean snapshot-app

-

-all:    clean app

-

-all-chunky:    clean app-chunky

-

-test:	clean cli

-

-dev:	clean internal

-

-app:    libhb/hbversion.h

-	(./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -target libhb -target HandBrake -target HandBrakeCLI -configuration UB HB_BUILD="$(HB_BUILD)" HB_VERSION="$(HB_VERSION)" APPCAST_URL="http://handbrake.fr/appcast.xml" build | sed '/^$$/d'  )

-

-contrib/.contrib:

-	@$(MAKE) --no-print-directory -C contrib all

-

-snapshot-app: contrib/.contrib unstable-libhb/hbversion.h

-	( cd macosx ; xcodebuild -target libhb -target HandBrake -target HandBrakeCLI -configuration Deployment HB_BUILD="$(SNAP_HB_BUILD)" HB_VERSION="$(SNAP_HB_VERSION)" CURRENT_PROJECT_VERSION="$(SNAP_HB_VERSION)" APPCAST_URL="http://handbrake.fr/appcast_unstable.xml" build | sed '/^$$/d' )

-

-app-chunky: libhb/hbversion.h

-	(./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB HB_BUILD="$(HB_BUILD)" HB_VERSION="$(HB_VERSION)" APPCAST_URL="http://handbrake.fr/appcast.xml" build | sed '/^$$/d'  )

-

-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 )

-

-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' )

-

-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 )

-

-gui-snapshot-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-$(SNAP_HB_VERSION)-MacOSX.5_GUI_UB.dmg ; rm -rf HandBrake )

-

-cli-snapshot-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-$(SNAP_HB_VERSION)-MacOSX.5_CLI_UB.dmg ; rm -rf HandBrake )

-

-endif

-

-#

-# Linux

-#

-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: unstable-libhb/hbversion.h

-	@$(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

-	@rm libhb/hbversion.h

-

-mrproper: clean

-	@$(MAKE) --no-print-directory -C contrib mrproper

-

-endif

-

-#

-# Cygwin

-#

-ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)

-

-all:    contrib/.contrib libhb/libhb.a HandBrakeCLI

-

-app:	contribPack libhb/libhb.a HandBrakeCLI

-

-contribPack:

-	(./DownloadCygWinContribBinaries.sh)

-	

-contrib/.contrib:

-	@$(MAKE) --no-print-directory -C contrib all

-

-libhb/libhb.a: unstable-libhb/hbversion.h

-	@$(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

-	@rm libhb/hbversion.h

-

-mrproper: clean

-	@$(MAKE) --no-print-directory -C contrib mrproper

-

-endif

-

-libhb/hbversion.h:

-	echo "#ifndef HB_BUILD" > libhb/hbversion.h

-	echo "#define HB_BUILD $(HB_BUILD)" >> libhb/hbversion.h

-	echo "#endif" >> libhb/hbversion.h

-	echo "#ifndef HB_VERSION" >> libhb/hbversion.h

-	echo "#define HB_VERSION \"$(HB_VERSION)\"" >> libhb/hbversion.h

-	echo "#endif" >> libhb/hbversion.h

-	echo "#ifndef HB_APPCAST_URL" >> libhb/hbversion.h

-	echo "#define APPCAST_URL \"http://handbrake.fr/appcast.xml\"" >> libhb/hbversion.h

-	echo "#endif" >> libhb/hbversion.h

-

-unstable-libhb/hbversion.h:

-	echo "#ifndef HB_BUILD" > libhb/hbversion.h

-	echo "#define HB_BUILD $(SNAP_HB_BUILD)" >> libhb/hbversion.h

-	echo "#endif" >> libhb/hbversion.h

-	echo "#ifndef HB_VERSION" >> libhb/hbversion.h

-	echo "#define HB_VERSION \"$(SNAP_HB_VERSION)\"" >> libhb/hbversion.h

-	echo "#endif" >> libhb/hbversion.h

-	echo "#ifndef HB_APPCAST_URL" >> libhb/hbversion.h

-	echo "#define APPCAST_URL \"http://handbrake.fr/appcast_unstable.xml\"" >> libhb/hbversion.h

-	echo "#endif" >> libhb/hbversion.h

+include Makefile.config
+
+SYSTEM = $(shell uname -s)
+
+# Special case for Mac OS X: everything is handled from the Xcode project
+
+#
+# Darwin
+#
+ifeq ($(SYSTEM),Darwin)
+
+snapshot:   clean snapshot-app
+
+all:    clean app
+
+all-chunky:    clean app-chunky
+
+test:	clean cli
+
+dev:	clean internal
+
+app:    libhb/hbversion.h
+	(./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -target libhb -target HandBrake -target HandBrakeCLI -configuration UB HB_BUILD="$(HB_BUILD)" HB_VERSION="$(HB_VERSION)" APPCAST_URL="http://handbrake.fr/appcast.xml" build | sed '/^$$/d'  )
+
+contrib/.contrib:
+	@$(MAKE) --no-print-directory -C contrib all
+
+snapshot-app: contrib/.contrib unstable-libhb/hbversion.h
+	( cd macosx ; xcodebuild -target libhb -target HandBrake -target HandBrakeCLI -configuration Deployment HB_BUILD="$(SNAP_HB_BUILD)" HB_VERSION="$(SNAP_HB_VERSION)" CURRENT_PROJECT_VERSION="$(SNAP_HB_VERSION)" APPCAST_URL="http://handbrake.fr/appcast_unstable.xml" build | sed '/^$$/d' )
+
+app-chunky: libhb/hbversion.h
+	(./DownloadMacOsXContribBinaries.sh ; cd macosx ; xcodebuild -alltargets -configuration UB HB_BUILD="$(HB_BUILD)" HB_VERSION="$(HB_VERSION)" APPCAST_URL="http://handbrake.fr/appcast.xml" build | sed '/^$$/d'  )
+
+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 )
+
+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' )
+
+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 )
+
+gui-snapshot-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-$(SNAP_HB_VERSION)-MacOSX.5_GUI_UB.dmg ; rm -rf HandBrake )
+
+cli-snapshot-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-$(SNAP_HB_VERSION)-MacOSX.5_CLI_UB.dmg ; rm -rf HandBrake )
+
+endif
+
+#
+# Linux
+#
+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: unstable-libhb/hbversion.h
+	@$(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
+	@rm libhb/hbversion.h
+
+mrproper: clean
+	@$(MAKE) --no-print-directory -C contrib mrproper
+
+endif
+
+#
+# Cygwin
+#
+ifeq ($(findstring CYGWIN_NT,$(SYSTEM)),CYGWIN_NT)
+
+all:    contrib/.contrib libhb/libhb.a HandBrakeCLI
+
+app:	contribPack libhb/libhb.a HandBrakeCLI
+
+contribPack:
+	(./DownloadCygWinContribBinaries.sh)
+	
+contrib/.contrib:
+	@$(MAKE) --no-print-directory -C contrib all
+
+libhb/libhb.a: unstable-libhb/hbversion.h
+	@$(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
+	@rm libhb/hbversion.h
+
+mrproper: clean
+	@$(MAKE) --no-print-directory -C contrib mrproper
+
+endif
+
+libhb/hbversion.h:
+	echo "#ifndef HB_BUILD" > libhb/hbversion.h
+	echo "#define HB_BUILD $(HB_BUILD)" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h
+	echo "#ifndef HB_VERSION" >> libhb/hbversion.h
+	echo "#define HB_VERSION \"$(HB_VERSION)\"" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h
+	echo "#ifndef HB_APPCAST_URL" >> libhb/hbversion.h
+	echo "#define APPCAST_URL \"http://handbrake.fr/appcast.xml\"" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h
+
+unstable-libhb/hbversion.h:
+	echo "#ifndef HB_BUILD" > libhb/hbversion.h
+	echo "#define HB_BUILD $(SNAP_HB_BUILD)" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h
+	echo "#ifndef HB_VERSION" >> libhb/hbversion.h
+	echo "#define HB_VERSION \"$(SNAP_HB_VERSION)\"" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h
+	echo "#ifndef HB_APPCAST_URL" >> libhb/hbversion.h
+	echo "#define APPCAST_URL \"http://handbrake.fr/appcast_unstable.xml\"" >> libhb/hbversion.h
+	echo "#endif" >> libhb/hbversion.h