[SCM] x264 packaging branch, master, updated. debian/0.svn20090621+git364d7d-2-2-gb67755c

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

The following commit has been merged in the master branch:
commit b67755cc194db7b6901446164eb8c61ec51e0bea
Author: Fabian Greffrath <fabian at debian-unofficial.org>
Date:   Thu Aug 13 16:25:07 2009 +0200

    Revert changes to Makefile in the master branch.

diff --git a/Makefile b/Makefile
index 0b4cbf1..594e98b 100644
--- a/Makefile
+++ b/Makefile
@@ -80,8 +80,7 @@ libx264.a: .depend $(OBJS) $(OBJASM)
 $(SONAME): .depend $(OBJS) $(OBJASM)
 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
 
-x264$(EXE): $(SONAME)
-x264$(EXE): $(OBJCLI)
+x264$(EXE): $(OBJCLI) libx264.a 
 	$(CC) -o $@ $+ $(LDFLAGS)
 
 checkasm: tools/checkasm.o libx264.a

-- 
x264 packaging