[vlc-commits] Breakpad: cleanup and regroup targets

[Jean-Baptiste Kempf]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Feb 21 17:31:29 2017 +0100| [81b886b1e49b98c9f768b6b1acec16d1da9fb61b] | committer: Jean-Baptiste Kempf

Breakpad: cleanup and regroup targets

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=81b886b1e49b98c9f768b6b1acec16d1da9fb61b
---

 contrib/src/breakpad/rules.mak | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/contrib/src/breakpad/rules.mak b/contrib/src/breakpad/rules.mak
index e629ea5..c12ce2d 100644
--- a/contrib/src/breakpad/rules.mak
+++ b/contrib/src/breakpad/rules.mak
@@ -15,15 +15,20 @@ $(TARBALLS)/breakpad-$(BREAKPAD_HASH).tar.gz:
 	touch $@
 
 breakpad: breakpad-$(BREAKPAD_HASH).tar.gz .sum-breakpad
-	rm -Rf $@ $@.tmp
-	mkdir $@.tmp
-	tar xvzf $(TARBALLS)/breakpad-$(BREAKPAD_HASH).tar.gz -C $@.tmp
-	mv -f $@.tmp $@
+	rm -Rf $@ breakpad-$(BREAKPAD_HASH)
+	mkdir breakpad-$(BREAKPAD_HASH)
+	tar xvzf $(TARBALLS)/breakpad-$(BREAKPAD_HASH).tar.gz -C breakpad-$(BREAKPAD_HASH)
+	$(MOVE)
 
 .breakpad: breakpad
+	# Framework
 	cd $</src/client/mac/ && xcodebuild $(XCODE_FLAGS) CLANG_CXX_LIBRARY=libc++ WARNING_CFLAGS=-Wno-error
-	cd $</src/tools/mac/dump_syms && xcodebuild $(XCODE_FLAGS) CLANG_CXX_LIBRARY=libc++ WARNING_CFLAGS=-Wno-error
-	install -d $(PREFIX)
-	cd $</src/client/mac/ && mkdir -p "$(PREFIX)/Frameworks" && cp -R build/Release/Breakpad.framework "$(PREFIX)/Frameworks"
-	cd $</src/tools/mac/dump_syms && cp -R build/Release/dump_syms "$(PREFIX)/bin"
+	cd $</src/client/mac/ && \
+		mkdir -p "$(PREFIX)/Frameworks" && \
+		rm -Rf $(PREFIX)/Frameworks/Breakpad.framework && \
+		cp -R build/Release/Breakpad.framework "$(PREFIX)/Frameworks"
+	# Tools
+	cd $</src/tools/mac/dump_syms && \
+		xcodebuild $(XCODE_FLAGS) CLANG_CXX_LIBRARY=libc++ WARNING_CFLAGS=-Wno-error && \
+		cp -R build/Release/dump_syms "$(PREFIX)/bin"
 	touch $@