[SCM] x264 packaging branch, master, updated. 0e68cf291dce445ea4a52918705cb355b5b3cdb3

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 6007edd1451f433777601b71e0368e8114fdcdfc
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Mon Jun 15 12:32:13 2009 +0200

    Clean up CFLAGS.

diff --git a/debian/rules b/debian/rules
index bb9f32a..3d91736 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,15 +23,9 @@ endif
 
 confflags = --enable-pthread --prefix=/usr --enable-debug
 
-CFLAGS += -Wall -g
+CFLAGS += -Wall -g -O$(if $(findstring noopt,$(DEB_BUILD_OPTIONS)),0,2)
 LDFLAGS += -Wl,--as-needed
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
 build: build-stamp
 build-stamp: debian/stamp-patched
 	dh_testdir

-- 
x264 packaging