Annotation of /trunk/x264/patches/x264-20080530_2245-no-libs.patch
Parent Directory | Revision Log
Revision 628 -
(hide annotations)
(download)
Sat May 31 16:41:44 2008 UTC (16 years, 4 months ago) by niro
File size: 2793 byte(s)
Sat May 31 16:41:44 2008 UTC (16 years, 4 months ago) by niro
File size: 2793 byte(s)
-re-diffed
1 | niro | 628 | diff -Naur x264-snapshot-20080530-2245/configure x264-snapshot-20080530-2245-magellan/configure |
2 | --- x264-snapshot-20080530-2245/configure 2008-05-30 22:45:08.000000000 +0200 | ||
3 | +++ x264-snapshot-20080530-2245-magellan/configure 2008-05-31 18:45:53.000000000 +0200 | ||
4 | @@ -451,7 +451,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 | if [ "$gtk" = "yes" ]; then | ||
10 | echo "SONAMEGTK=libx264gtk.so.$API" >> gtk/config.mak | ||
11 | fi | ||
12 | diff -Naur x264-snapshot-20080530-2245/gtk/Makefile x264-snapshot-20080530-2245-magellan/gtk/Makefile | ||
13 | --- x264-snapshot-20080530-2245/gtk/Makefile 2008-05-30 22:45:08.000000000 +0200 | ||
14 | +++ x264-snapshot-20080530-2245-magellan/gtk/Makefile 2008-05-31 18:46:57.000000000 +0200 | ||
15 | @@ -46,14 +46,14 @@ | ||
16 | |||
17 | X264GTK_PC = x264gtk.pc | ||
18 | |||
19 | -EXTERNAL_DEPS= ../muxers.o ../matroska.o ../libx264.a | ||
20 | +EXTERNAL_DEPS= ../muxers.o ../matroska.o | ||
21 | |||
22 | |||
23 | all: $(ENCODE_BIN) $(TEST_BIN) $(MO_FILES) $(X264GTK_PC) | ||
24 | |||
25 | # Already provides iconv/intl | ||
26 | CPPFLAGS = -g `pkg-config --cflags gtk+-2.0 gthread-2.0` -I.. -DX264_DATA_DIR=\"${datadir}\" | ||
27 | -LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0` ../libx264.a | ||
28 | +LDFLAGS += `pkg-config --libs gtk+-2.0 gthread-2.0 x264` | ||
29 | |||
30 | |||
31 | # gettext rules | ||
32 | diff -Naur x264-snapshot-20080530-2245/Makefile x264-snapshot-20080530-2245-magellan/Makefile | ||
33 | --- x264-snapshot-20080530-2245/Makefile 2008-05-30 22:45:08.000000000 +0200 | ||
34 | +++ x264-snapshot-20080530-2245-magellan/Makefile 2008-05-31 18:45:30.000000000 +0200 | ||
35 | @@ -78,10 +78,10 @@ | ||
36 | $(SONAME): .depend $(OBJS) $(OBJASM) | ||
37 | $(CC) -shared -o $@ $(OBJS) $(OBJASM) $(SOFLAGS) $(LDFLAGS) | ||
38 | |||
39 | -x264$(EXE): $(OBJCLI) libx264.a | ||
40 | - $(CC) -o $@ $+ $(LDFLAGS) | ||
41 | +x264$(EXE): $(OBJCLI) | ||
42 | + $(CC) -o $@ $+ $(LDFLAGS) `pkg-config --libs x264` | ||
43 | |||
44 | -libx264gtk.a: muxers.o libx264.a | ||
45 | +libx264gtk.a: muxers.o | ||
46 | $(MAKE) -C gtk | ||
47 | |||
48 | checkasm: tools/checkasm.o libx264.a | ||
49 | @@ -148,21 +148,9 @@ | ||
50 | rm -rf test/ | ||
51 | $(MAKE) -C gtk distclean | ||
52 | |||
53 | -install: x264$(EXE) $(SONAME) | ||
54 | - install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) | ||
55 | - install -d $(DESTDIR)$(libdir) $(DESTDIR)$(libdir)/pkgconfig | ||
56 | - install -m 644 x264.h $(DESTDIR)$(includedir) | ||
57 | - install -m 644 libx264.a $(DESTDIR)$(libdir) | ||
58 | - install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig | ||
59 | +install: x264$(EXE) | ||
60 | + install -d $(DESTDIR)$(bindir) | ||
61 | install x264$(EXE) $(DESTDIR)$(bindir) | ||
62 | - ranlib $(DESTDIR)$(libdir)/libx264.a | ||
63 | -ifeq ($(SYS),MINGW) | ||
64 | - $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(bindir)) | ||
65 | -else | ||
66 | - $(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so) | ||
67 | - $(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir)) | ||
68 | -endif | ||
69 | - $(if $(IMPLIBNAME), install -m 644 $(IMPLIBNAME) $(DESTDIR)$(libdir)) | ||
70 | |||
71 | install-gtk: libx264gtk.a | ||
72 | $(MAKE) -C gtk install |