Contents of /trunk/x264/patches/x264-20100905_2245-no-libs.patch
Parent Directory | Revision Log
Revision 1120 -
(show annotations)
(download)
Mon Sep 6 20:23:46 2010 UTC (14 years ago) by niro
File size: 2020 byte(s)
Mon Sep 6 20:23:46 2010 UTC (14 years ago) by niro
File size: 2020 byte(s)
-re-diffed for 20100905
1 | diff -Naur x264-snapshot-20100905-2245/configure x264-snapshot-20100905-2245-magellan/configure |
2 | --- x264-snapshot-20100905-2245/configure 2010-09-05 22:45:07.000000000 +0200 |
3 | +++ x264-snapshot-20100905-2245-magellan/configure 2010-09-06 22:24:27.000000000 +0200 |
4 | @@ -754,7 +754,6 @@ |
5 | echo "SONAME=libx264.so.$API" >> config.mak |
6 | echo 'SOFLAGS=-Wl,-soname,$(SONAME)' >> config.mak |
7 | fi |
8 | - echo 'default: $(SONAME)' >> config.mak |
9 | fi |
10 | |
11 | ./version.sh >> config.h |
12 | diff -Naur x264-snapshot-20100905-2245/Makefile x264-snapshot-20100905-2245-magellan/Makefile |
13 | --- x264-snapshot-20100905-2245/Makefile 2010-09-05 22:45:07.000000000 +0200 |
14 | +++ x264-snapshot-20100905-2245-magellan/Makefile 2010-09-06 22:27:13.000000000 +0200 |
15 | @@ -130,8 +130,8 @@ |
16 | $(SONAME): .depend $(OBJS) $(OBJASM) $(OBJSO) |
17 | $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(OBJSO) $(SOFLAGS) $(LDFLAGS) |
18 | |
19 | -x264$(EXE): $(OBJCLI) libx264.a |
20 | - $(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS) |
21 | +x264$(EXE): $(OBJCLI) |
22 | + $(CC) -o $@ $+ $(LDFLAGSCLI) $(LDFLAGS) `pkg-config --libs x264` |
23 | |
24 | checkasm: tools/checkasm.o libx264.a |
25 | $(CC) -o $@ $+ $(LDFLAGS) |
26 | @@ -196,23 +196,9 @@ |
27 | rm -f config.mak config.h config.log x264.pc |
28 | rm -rf test/ |
29 | |
30 | -install: x264$(EXE) $(SONAME) |
31 | +install: x264$(EXE) |
32 | install -d $(DESTDIR)$(bindir) |
33 | - install -d $(DESTDIR)$(includedir) |
34 | - install -d $(DESTDIR)$(libdir) |
35 | - install -d $(DESTDIR)$(libdir)/pkgconfig |
36 | - install -m 644 x264.h $(DESTDIR)$(includedir) |
37 | - install -m 644 libx264.a $(DESTDIR)$(libdir) |
38 | - install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig |
39 | install x264$(EXE) $(DESTDIR)$(bindir) |
40 | - $(RANLIB) $(DESTDIR)$(libdir)/libx264.a |
41 | -ifeq ($(SYS),MINGW) |
42 | - $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir)) |
43 | -else |
44 | - $(if $(SONAME), ln -f -s $(SONAME) $(DESTDIR)$(libdir)/libx264.$(SOSUFFIX)) |
45 | - $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir)) |
46 | -endif |
47 | - $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)) |
48 | |
49 | uninstall: |
50 | rm -f $(DESTDIR)$(includedir)/x264.h $(DESTDIR)$(libdir)/libx264.a |