[vlc-commits] package/win32: Split SDK packetization in a separate rule

[Hugo Beauzée-Luyssen]

vlc/vlc-3.0 | branch: master | Hugo Beauzée-Luyssen <hugo at beauzee.fr> | Tue Dec 12 18:00:16 2017 +0100| [87e2b50e4a28e2ecb816ba4c3af349bd085e6fd6] | committer: Hugo Beauzée-Luyssen

package/win32: Split SDK packetization in a separate rule

(cherry picked from commit 95dd6c8c179c935aca87d9be209937bcda00ca4d)
Signed-off-by: Hugo Beauzée-Luyssen <hugo at beauzee.fr>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=87e2b50e4a28e2ecb816ba4c3af349bd085e6fd6
---

 extras/package/win32/package.mak | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

diff --git a/extras/package/win32/package.mak b/extras/package/win32/package.mak
index 330377578b..fd44091b3d 100644
--- a/extras/package/win32/package.mak
+++ b/extras/package/win32/package.mak
@@ -26,9 +26,19 @@ package-win-install:
 	$(MAKE) install
 	touch $@
 
-package-win-common: package-win-install
-	mkdir -p "$(win32_destdir)"/
+package-win-sdk:
+	mkdir -p "$(win32_destdir)/sdk/lib/"
+	cp -r $(prefix)/include "$(win32_destdir)/sdk"
+	cp -r $(prefix)/lib/pkgconfig "$(win32_destdir)/sdk/lib"
+	cd $(prefix)/lib && cp -rv libvlc.la libvlccore.la "$(win32_destdir)/sdk/lib/"
+	cd $(prefix)/lib && cp -rv libvlc.dll.a "$(win32_destdir)/sdk/lib/libvlc.lib"
+	cd $(prefix)/lib && cp -rv libvlccore.dll.a "$(win32_destdir)/sdk/lib/libvlccore.lib"
+	$(DLLTOOL) -D libvlc.dll -l "$(win32_destdir)/sdk/lib/libvlc.lib" -d "$(top_builddir)/lib/.libs/libvlc.dll.def" "$(prefix)/bin/libvlc.dll"
+	echo "INPUT(libvlc.lib)" > "$(win32_destdir)/sdk/lib/vlc.lib"
+	$(DLLTOOL) -D libvlccore.dll -l "$(win32_destdir)/sdk/lib/libvlccore.lib" -d "$(top_builddir)/src/.libs/libvlccore.dll.def" "$(prefix)/bin/libvlccore.dll"
+	echo "INPUT(libvlccore.lib)" > "$(win32_destdir)/sdk/lib/vlccore.lib"
 
+package-win-common: package-win-install package-win-sdk
 # Executables, major libs
 	find $(prefix) -maxdepth 4 \( -name "*$(LIBEXT)" -o -name "*$(EXEEXT)" \) -exec cp {} "$(win32_destdir)/" \;
 
@@ -61,18 +71,6 @@ endif
 # HRTF
 	cp -r $(srcdir)/share/hrtfs $(win32_destdir)/
 
-# SDK
-	mkdir -p "$(win32_destdir)/sdk/lib/"
-	cp -r $(prefix)/include "$(win32_destdir)/sdk"
-	cp -r $(prefix)/lib/pkgconfig "$(win32_destdir)/sdk/lib"
-	cd $(prefix)/lib && cp -rv libvlc.la libvlccore.la "$(win32_destdir)/sdk/lib/"
-	cd $(prefix)/lib && cp -rv libvlc.dll.a "$(win32_destdir)/sdk/lib/libvlc.lib"
-	cd $(prefix)/lib && cp -rv libvlccore.dll.a "$(win32_destdir)/sdk/lib/libvlccore.lib"
-	$(DLLTOOL) -D libvlc.dll -l "$(win32_destdir)/sdk/lib/libvlc.lib" -d "$(top_builddir)/lib/.libs/libvlc.dll.def" "$(prefix)/bin/libvlc.dll"
-	echo "INPUT(libvlc.lib)" > "$(win32_destdir)/sdk/lib/vlc.lib"
-	$(DLLTOOL) -D libvlccore.dll -l "$(win32_destdir)/sdk/lib/libvlccore.lib" -d "$(top_builddir)/src/.libs/libvlccore.dll.def" "$(prefix)/bin/libvlccore.dll"
-	echo "INPUT(libvlccore.lib)" > "$(win32_destdir)/sdk/lib/vlccore.lib"
-
 # Convert to DOS line endings
 	find $(win32_destdir) -type f \( -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*.lua' \) -exec $(U2D) -q {} \;