[vlc-commits] live555: patch after extracting, before compiling

[Rafaël Carré]

vlc/vlc-1.2 | branch: master | Rafaël Carré <funman at videolan.org> | Sun Jan 22 04:15:55 2012 -0500| [40531e0e6335f859d30ff75e4ece40b538670acb] | committer: Jean-Baptiste Kempf

live555: patch after extracting, before compiling
(cherry picked from commit 341253eddfb02030c824d7972c41ed04631c31e6)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=40531e0e6335f859d30ff75e4ece40b538670acb
---

 contrib/src/live555/rules.mak |   30 +++++++++++++++---------------
 1 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/contrib/src/live555/rules.mak b/contrib/src/live555/rules.mak
index 340c79f..b1af1e3 100644
--- a/contrib/src/live555/rules.mak
+++ b/contrib/src/live555/rules.mak
@@ -11,16 +11,6 @@ $(TARBALLS)/$(LIVE555_FILE):
 
 .sum-live555: $(LIVE555_FILE)
 
-live555: $(LIVE555_FILE) .sum-live555
-	rm -Rf live
-	$(UNPACK)
-	chmod -R u+w live
-ifdef HAVE_ANDROID
-	patch -p0 < $(SRC)/live555/android.patch
-endif
-	mv live $@
-	touch $@
-
 LIVE_TARGET = $(error live555 target not defined!)
 ifdef HAVE_LINUX
 LIVE_TARGET := linux
@@ -35,19 +25,29 @@ ifdef HAVE_MACOSX
 LIVE_TARGET := macosx
 endif
 
-.live555: live555
+live555: $(LIVE555_FILE) .sum-live555
+	rm -Rf live
+	$(UNPACK)
+	chmod -R u+w live
+ifdef HAVE_ANDROID
+	patch -p0 < $(SRC)/live555/android.patch
+endif
 ifdef HAVE_WINCE
-	cd $< && sed -e 's/-lws2_32/-lws2/g' -i.orig config.mingw
+	cd live && sed -e 's/-lws2_32/-lws2/g' -i.orig config.mingw
 endif
 ifdef HAVE_MACOSX
-	cd $< && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx*
+	cd live && sed -i.orig -e s/"libtool -s -o"/"ar cr"/g config.macosx*
 endif
-	cd $< && sed \
+	cd live && sed \
 		-e 's%-DBSD=1%-DBSD=1\ $(EXTRA_CFLAGS)\ $(EXTRA_LDFLAGS)%' \
 		-e 's%cc%$(CC)%' \
 		-e 's%c++%$(CXX)\ $(EXTRA_LDFLAGS)%' \
 		-i.orig config.macosx
-	cd $< && sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux
+	cd live && sed -e 's%-D_FILE_OFFSET_BITS=64%-D_FILE_OFFSET_BITS=64\ -fPIC\ -DPIC%' -i.orig config.linux
+	mv live $@
+	touch $@
+
+.live555: live555
 	cd $< && ./genMakefiles $(LIVE_TARGET)
 	cd $< && $(MAKE) $(HOSTVARS)
 	mkdir -p -- "$(PREFIX)/lib" "$(PREFIX)/include"