diff -Naur x264-snapshot-20080530-2245/configure x264-snapshot-20080530-2245-magellan/configure
--- x264-snapshot-20080530-2245/configure	2008-05-30 22:45:08.000000000 +0200
+++ x264-snapshot-20080530-2245-magellan/configure	2008-05-31 18:45:53.000000000 +0200
@@ -451,7 +451,6 @@
         echo "SONAME=libx264.so.$API" >> config.mak
         echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak
     fi
-    echo 'default: $(SONAME)' >> config.mak
     if [ "$gtk" = "yes" ]; then
         echo "SONAMEGTK=libx264gtk.so.$API" >> gtk/config.mak
     fi
diff -Naur x264-snapshot-20080530-2245/gtk/Makefile x264-snapshot-20080530-2245-magellan/gtk/Makefile
--- x264-snapshot-20080530-2245/gtk/Makefile	2008-05-30 22:45:08.000000000 +0200
+++ x264-snapshot-20080530-2245-magellan/gtk/Makefile	2008-05-31 18:46:57.000000000 +0200
@@ -46,14 +46,14 @@
 
 X264GTK_PC = x264gtk.pc
 
-EXTERNAL_DEPS= ../muxers.o ../matroska.o ../libx264.a
+EXTERNAL_DEPS= ../muxers.o ../matroska.o
 
 
 all: $(ENCODE_BIN) $(TEST_BIN) $(MO_FILES) $(X264GTK_PC)
 
 # Already provides iconv/intl
 CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0` -I.. -DX264_DATA_DIR=\"${datadir}\"
-LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0` ../libx264.a
+LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0 x264`
 
 
 # gettext rules
diff -Naur x264-snapshot-20080530-2245/Makefile x264-snapshot-20080530-2245-magellan/Makefile
--- x264-snapshot-20080530-2245/Makefile	2008-05-30 22:45:08.000000000 +0200
+++ x264-snapshot-20080530-2245-magellan/Makefile	2008-05-31 18:45:30.000000000 +0200
@@ -78,10 +78,10 @@
 $(SONAME): .depend $(OBJS) $(OBJASM)
 	$(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS)
 
-x264$(EXE): $(OBJCLI) libx264.a 
-	$(CC) -o $@ $+ $(LDFLAGS)
+x264$(EXE): $(OBJCLI)
+	$(CC) -o $@ $+ $(LDFLAGS) `pkg-config --libs x264`
 
-libx264gtk.a: muxers.o libx264.a
+libx264gtk.a: muxers.o
 	$(MAKE) -C gtk
 
 checkasm: tools/checkasm.o libx264.a
@@ -148,21 +148,9 @@
 	rm -rf test/
 	$(MAKE) -C gtk distclean
 
-install: x264$(EXE) $(SONAME)
-	install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)
-	install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig
-	install -m 644 x264.h $(DESTDIR)$(includedir)
-	install -m 644 libx264.a $(DESTDIR)$(libdir)
-	install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
+install: x264$(EXE)
+	install -d $(DESTDIR)$(bindir)
 	install x264$(EXE) $(DESTDIR)$(bindir)
-	ranlib $(DESTDIR)$(libdir)/libx264.a
-ifeq ($(SYS),MINGW)
-	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir))
-else
-	$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
-	$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
-endif
-	$(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir))
 
 install-gtk: libx264gtk.a
 	$(MAKE) -C gtk install