[vlc-commits] Makefile, win32: fix sdk/ generation

Jean-Baptiste Kempf git at videolan.org
Mon Jan 24 18:02:30 CET 2011


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jan 24 18:02:00 2011 +0100| [016985e822db8e5e54dc393f9c7a4e5eb0666d11] | committer: Jean-Baptiste Kempf

Makefile, win32: fix sdk/ generation

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

 Makefile.am |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f5eb287..6cb20d6 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -754,7 +754,7 @@ endif
 	cp -r $(destdir)/include "$(win32_destdir)/sdk"
 	cp -r $(destdir)/lib/pkgconfig "$(win32_destdir)/sdk/lib"
 	for file in libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la; do \
-        cp -r $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done
+        cp -rv $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done
 if !HAVE_WIN64
 if !HAVE_WINCE
 	mkdir -p "$(win32_destdir)/sdk/activex"
@@ -769,7 +769,7 @@ endif
 if USE_PEFLAGS
 	find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -print -o -name '*$(EXEEXT)' -print \) -exec $(PEFLAGS) --dynamicbase=true --nxcompat=true {} \;
 endif
-	find $(win32_destdir) -type f \( -name '*.a' -or -name '*.la' \) -exec rm -rf {} \;
+	find $(win32_destdir)/plugins/ -type f \( -name '*.a' -or -name '*.la' \) -exec rm -rvf {} \;
 
 package-win-base: package-win-common
 	find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' \) | while read i; \



More information about the vlc-commits mailing list