~ubuntu-branches/ubuntu/wily/rtmpdump/wily-proposed

« back to all changes in this revision

Viewing changes to debian/patches/03-Dont-link-explicitly-against-static-library.patch

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler, Reinhard Tartler, Andres Mejia
  • Date: 2010-08-01 08:59:47 UTC
  • Revision ID: james.westby@ubuntu.com-20100801085947-1q4nbw2y5rwys5r6
Tags: 2.3-2
[ Reinhard Tartler ]
* make librtmp-dev depend on librtmp0

[ Andres Mejia ]
* Move ${misc:Depends} as last entry in Depends field of librtmp-dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
 
1
------------------------------------------------------------------------
 
2
r544 | hyc | 2010-07-08 12:38:33 +0200 (Thu, 08 Jul 2010) | 2 lines
 
3
 
 
4
Don't link explicitly against static library
 
5
 
 
6
------------------------------------------------------------------------
 
7
--- rtmpdump.orig/Makefile
 
8
+++ rtmpdump/Makefile
 
9
@@ -33,7 +33,7 @@ MANDIR=$(DESTDIR)$(mandir)
 
10
 
 
11
 LIBS_posix=
 
12
 LIBS_mingw=-lws2_32 -lwinmm -lgdi32
 
13
-LIBS=$(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS)
 
14
+LIBS=-L librtmp -lrtmp $(CRYPTO_LIB) -lz $(LIBS_$(SYS)) $(XLIBS)
 
15
 
 
16
 THREADLIB_posix=-lpthread
 
17
 THREADLIB_mingw=
 
18
@@ -47,11 +47,13 @@ EXT_posix=
 
19
 EXT_mingw=.exe
 
20
 EXT=$(EXT_$(SYS))
 
21
 
 
22
-all:   $(LIBRTMP) progs
 
23
+PROGS=rtmpdump rtmpgw rtmpsrv rtmpsuck
 
24
 
 
25
-progs: rtmpdump rtmpgw rtmpsrv rtmpsuck
 
26
+all:   $(LIBRTMP) $(PROGS)
 
27
 
 
28
-install:       progs
 
29
+$(PROGS): $(LIBRTMP)
 
30
+
 
31
+install:       $(PROGS)
 
32
        -mkdir -p $(BINDIR) $(SBINDIR) $(MANDIR)/man1 $(MANDIR)/man8
 
33
        cp rtmpdump$(EXT) $(BINDIR)
 
34
        cp rtmpgw$(EXT) rtmpsrv$(EXT) rtmpsuck$(EXT) $(SBINDIR)
 
35
@@ -68,20 +70,17 @@ FORCE:
 
36
 $(LIBRTMP): FORCE
 
37
        @cd librtmp; $(MAKE) all
 
38
 
 
39
-# note: $^ is GNU Make's equivalent to BSD $>
 
40
-# we use both since either make will ignore the one it doesn't recognize
 
41
-
 
42
-rtmpdump: rtmpdump.o $(LIBRTMP)
 
43
-       $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS)
 
44
+rtmpdump: rtmpdump.o
 
45
+       $(CC) $(LDFLAGS) -o $@$(EXT) $@.o $(LIBS)
 
46
 
 
47
-rtmpsrv: rtmpsrv.o thread.o $(LIBRTMP)
 
48
-       $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
 
49
+rtmpsrv: rtmpsrv.o thread.o
 
50
+       $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
 
51
 
 
52
-rtmpsuck: rtmpsuck.o thread.o $(LIBRTMP)
 
53
-       $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
 
54
+rtmpsuck: rtmpsuck.o thread.o
 
55
+       $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
 
56
 
 
57
-rtmpgw: rtmpgw.o thread.o $(LIBRTMP)
 
58
-       $(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
 
59
+rtmpgw: rtmpgw.o thread.o
 
60
+       $(CC) $(LDFLAGS) -o $@$(EXT) $@.o thread.o $(SLIBS)
 
61
 
 
62
 rtmpgw.o: rtmpgw.c $(INCRTMP) Makefile
 
63
 rtmpdump.o: rtmpdump.c $(INCRTMP) Makefile