Index: x264-snapshot-20100118-2245/Makefile =================================================================== --- x264-snapshot-20100118-2245.orig/Makefile +++ x264-snapshot-20100118-2245/Makefile @@ -123,8 +123,8 @@ libx264.a: .depend $(OBJS) $(OBJASM) $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO) $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS) -x264$(EXE): $(OBJCLI) libx264.a - $(CC) -o $@ $+ $(LDFLAGS) $(LDFLAGSCLI) +x264$(EXE): $(OBJCLI) + $(CC) -o $@ $+ $(LDFLAGS) $(LDFLAGSCLI) `pkg-config --libs x264` checkasm: tools/checkasm.o libx264.a $(CC) -o $@ $+ $(LDFLAGS) @@ -189,21 +189,9 @@ distclean: clean rm -f config.mak config.h x264.pc rm -rf test/ -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.$(SOSUFFIX)) - $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir)) -endif - $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)) uninstall: rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a