Win32: no need for activex and mozilla folder.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 62e969dd4f77606e05c0e730c9a7f1b2ac57ce5c..9a33c3ebe6c7fb4b3e45b7d411f611879ba5e26a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -705,7 +705,7 @@ win32_http_destdir=$(win32_destdir)/http
 destdir=_win32
 
 #Win-common is for win32 and wince
-package-win-common:
+package-win-common: install
 # Check that tmp isn't in the way
        @if test -e "$(win32_destdir)"; then \
            echo "Error: please remove $(win32_destdir), it is in the way"; \
@@ -803,16 +803,12 @@ if BUILD_OSDMENU
        done
 endif
 if BUILD_MOZILLA
-       mkdir -p "$(win32_destdir)/mozilla"
-       cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)/mozilla/
-       cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)/mozilla/
+       cp $(top_builddir)/projects/mozilla/.libs/npvlc$(LIBEXT) $(win32_destdir)
+       cp $(top_srcdir)/projects/mozilla/npvlc.dll.manifest $(win32_destdir)
 endif
 if BUILD_ACTIVEX
-       mkdir -p "$(win32_destdir)/activex"
-       cp $(srcdir)/projects/activex/README.TXT  $(win32_destdir)/activex/
-       cp $(srcdir)/projects/activex/test.html  $(win32_destdir)/activex/
-       cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/
-       cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
+       cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)
+       cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)
 endif
 
 # SDK
@@ -822,6 +818,10 @@ endif
        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
+if BUILD_ACTIVEX
+       cp $(srcdir)/projects/activex/README.TXT $(win32_destdir)/sdk/
+       cp $(srcdir)/projects/activex/test.html $(win32_destdir)/sdk/
+endif
 
        find $(win32_destdir) -name "*xml" -or -name "*html" -or -name '*js' -or -name '*css' -or -name '*hosts' -or -iname '*txt' -or -name '*.cfg' -or -name '*lua' -exec unix2dos {} \;
 
@@ -837,9 +837,8 @@ endif
 
 # Strip DLLs
 package-win-common-strip: package-win-common
-       find $(win32_destdir) -name '*$(LIBEXT)' -or -name "*$(EXEEXT) | while read i; \
-       do \
-         if test -n "$$i" ; then \
+       find $(win32_destdir) -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' | while read i; \
+       do if test -n "$$i" ; then \
            $(OBJCOPY) --only-keep-debug "$$i" "$$i.dbg"; \
            $(OBJCOPY) --strip-all "$$i" ; \
            $(OBJCOPY) --add-gnu-debuglink="$$i.dbg" "$$i" ; \