[SCM] rtmpdump packaging branch, master, updated. debian/2.3-1-1-gdc4494b

[fabian-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit dc4494b88db0f1b82f981dfdc7b12f1cc1616d7f
Author: Fabian Greffrath <fabian at greffrath.com>
Date:   Tue Jul 6 08:38:57 2010 +0200

    Link the frontends against the shared library.

diff --git a/debian/patches/03_dynamic-frontend.patch b/debian/patches/03_dynamic-frontend.patch
new file mode 100644
index 0000000..a929022
--- /dev/null
+++ b/debian/patches/03_dynamic-frontend.patch
@@ -0,0 +1,32 @@
+--- rtmpdump.orig/Makefile
++++ rtmpdump/Makefile
+@@ -71,17 +71,21 @@ $(LIBRTMP): FORCE
+ # note: $^ is GNU Make's equivalent to BSD $>
+ # we use both since either make will ignore the one it doesn't recognize
+ 
+-rtmpdump: rtmpdump.o $(LIBRTMP)
+-	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS)
++rtmpdump: $(LIBRTMP)
++rtmpdump: rtmpdump.o
++	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(LIBS) -L librtmp -lrtmp
+ 
+-rtmpsrv: rtmpsrv.o thread.o $(LIBRTMP)
+-	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
++rtmpsrv: $(LIBRTMP)
++rtmpsrv: rtmpsrv.o thread.o
++	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) -L librtmp -lrtmp
+ 
+-rtmpsuck: rtmpsuck.o thread.o $(LIBRTMP)
+-	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
++rtmpsuck: $(LIBRTMP)
++rtmpsuck: rtmpsuck.o thread.o
++	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) -L librtmp -lrtmp
+ 
+-rtmpgw: rtmpgw.o thread.o $(LIBRTMP)
+-	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS)
++rtmpgw: $(LIBRTMP)
++rtmpgw: rtmpgw.o thread.o
++	$(CC) $(LDFLAGS) $^ $> -o $@$(EXT) $(SLIBS) -L librtmp -lrtmp
+ 
+ rtmpgw.o: rtmpgw.c $(INCRTMP) Makefile
+ rtmpdump.o: rtmpdump.c $(INCRTMP) Makefile
diff --git a/debian/patches/series b/debian/patches/series
index 984f470..a07fefb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 01_unbreak_makefile.diff
 02_strtime-visibility.patch
+03_dynamic-frontend.patch

-- 
rtmpdump packaging