[SCM] liblivemedia/master: Refresh 010_propagate_cflags.diff

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 221972f01fa8dd7e02ad94beae7cfeed6984ff76
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Apr 24 01:11:29 2012 +0200

    Refresh 010_propagate_cflags.diff

diff --git a/debian/patches/010_propagate_cflags.diff b/debian/patches/010_propagate_cflags.diff
index 042f16a..bcd9c90 100644
--- a/debian/patches/010_propagate_cflags.diff
+++ b/debian/patches/010_propagate_cflags.diff
@@ -1,15 +1,20 @@
---- a/config.linux
-+++ b/config.linux
+---
+ Makefile.tail |   14 +++++++-------
+ config.linux  |    2 +-
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+--- liblivemedia.orig/config.linux
++++ liblivemedia/config.linux
 @@ -1,4 +1,4 @@
 -COMPILE_OPTS =		$(INCLUDES) -I. -O2 -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
 +COMPILE_OPTS =		$(INCLUDES) -I. $(CFLAGS) -DSOCKLEN_T=socklen_t -D_LARGEFILE_SOURCE=1 -D_FILE_OFFSET_BITS=64
  C =			c
  C_COMPILER =		cc
  C_FLAGS =		$(COMPILE_OPTS)
---- a/Makefile.tail
-+++ b/Makefile.tail
-@@ -10,12 +10,12 @@
- MEDIA_SERVER_DIR = mediaServer
+--- liblivemedia.orig/Makefile.tail
++++ liblivemedia/Makefile.tail
+@@ -12,13 +12,13 @@ MEDIA_SERVER_DIR = mediaServer
+ PROXY_SERVER_DIR = proxyServer
  
  all:
 -	cd $(LIVEMEDIA_DIR) ; $(MAKE)
@@ -18,12 +23,14 @@
 -	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
 -	cd $(TESTPROGS_DIR) ; $(MAKE)
 -	cd $(MEDIA_SERVER_DIR) ; $(MAKE)
+-	cd $(PROXY_SERVER_DIR) ; $(MAKE)
 +	cd $(LIVEMEDIA_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
 +	cd $(GROUPSOCK_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
 +	cd $(USAGE_ENVIRONMENT_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
 +	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
 +	cd $(TESTPROGS_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
 +	cd $(MEDIA_SERVER_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
++	cd $(PROXY_SERVER_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
  
  clean:
  	cd $(LIVEMEDIA_DIR) ; $(MAKE) clean

-- 
liblivemedia packaging