[SCM] liblivemedia packaging branch, master, updated. debian/2008.07.25-2-12-g51e2a07

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

The following commit has been merged in the master branch:
commit 3fee18b743589dfef7b8e897274e084c846f39d5
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Sat Dec 5 14:03:49 2009 +0000

    Refresh patch

diff --git a/debian/patches/010_propagate_cflags.diff b/debian/patches/010_propagate_cflags.diff
index 29b0839..5575287 100644
--- a/debian/patches/010_propagate_cflags.diff
+++ b/debian/patches/010_propagate_cflags.diff
@@ -8,30 +8,25 @@ Index: liblivemedia/config.linux
  C =			c
  C_COMPILER =		cc
  C_FLAGS =		$(COMPILE_OPTS)
-Index: liblivemedia/Makefile.tail
-===================================================================
---- liblivemedia.orig/Makefile.tail	2009-07-11 23:38:24.000000000 +0100
-+++ liblivemedia/Makefile.tail	2009-07-12 00:00:10.000000000 +0100
-@@ -25,17 +25,17 @@
- 
+diff --git a/Makefile.tail b/Makefile.tail
+index 6838011..52fa704 100644
+--- a/Makefile.tail
++++ b/Makefile.tail
+@@ -10,12 +10,12 @@ TESTPROGS_DIR = testProgs
+ MEDIA_SERVER_DIR = mediaServer
  
- $(LIVEMEDIA_LIB):
+ all:
 -	cd $(LIVEMEDIA_DIR) ; $(MAKE)
-+	cd $(LIVEMEDIA_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
- $(GROUPSOCK_LIB):
 -	cd $(GROUPSOCK_DIR) ; $(MAKE)
-+	cd $(GROUPSOCK_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
- $(USAGE_ENVIRONMENT_LIB):
 -	cd $(USAGE_ENVIRONMENT_DIR) ; $(MAKE)
-+	cd $(USAGE_ENVIRONMENT_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
- $(BASIC_USAGE_ENVIRONMENT_LIB):
 -	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; $(MAKE)
-+	cd $(BASIC_USAGE_ENVIRONMENT_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
- $(TESTPROGS_APP): $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) $(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB)
 -	cd $(TESTPROGS_DIR) ; $(MAKE)
-+	cd $(TESTPROGS_DIR) ; CFLAGS="$(CFLAGS)" $(MAKE)
- $(MEDIA_SERVER_APP): $(LIVEMEDIA_LIB) $(GROUPSOCK_LIB) $(USAGE_ENVIRONMENT_LIB) $(BASIC_USAGE_ENVIRONMENT_LIB)
 -	cd $(MEDIA_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)
  
  clean:

-- 
liblivemedia packaging