X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=f78babb4115bdaa7243cc1f939f9c59a0290e980;hb=f78010cfdef42268d70c3a259bc1569838729302;hp=7b63bcfcce11a1cf4dc0370fbc8e17b2797507c7;hpb=5bf4823d25d6009f6c32b421f8e05799394f9899;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 7b63bcfcce..f78babb411 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -691,10 +691,26 @@ win32_debugdir=$(top_builddir)/symbols-$(VERSION)
 win32_lua_destdir=$(win32_destdir)/lua
 win32_xpi_destdir=$(win32_destdir)/vlc-plugin
 
+if HAVE_WIN64
+build-npapi:
+	touch $@
+
+build-activex:
+	touch $@
+else
+if HAVE_WINCE
+build-npapi:
+	touch $@
+
+build-activex:
+	touch $@
+else
 if HAVE_WIN32
 include extras/package/npapi.am
 include extras/package/activex.am
 endif
+endif
+endif
 
 #Win-common is for win32 and wince
 package-win-common: install build-npapi build-activex
@@ -794,11 +810,13 @@ if BUILD_OSDMENU
 	done
 endif
 if !HAVE_WIN64
+if !HAVE_WINCE
 	cp "$(top_builddir)/activex-vlc/src/axvlc.dll.manifest" "$(win32_destdir)/"
 	cp "$(top_builddir)/activex-vlc/installed/lib/axvlc.dll" "$(win32_destdir)/"
 	cp "$(top_builddir)/npapi-vlc/src/npvlc.dll.manifest" "$(win32_destdir)/"
 	cp "$(top_builddir)/npapi-vlc/installed/lib/npvlc.dll" "$(win32_destdir)/"
 endif
+endif
 
 # SDK
 	mkdir -p "$(win32_destdir)/sdk/lib"
@@ -807,9 +825,11 @@ endif
 	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 !HAVE_WIN64
+if !HAVE_WINCE
 	mkdir -p "$(win32_destdir)/sdk/activex"
 	cp $(top_builddir)/activex-vlc/README $(win32_destdir)/sdk/activex/README.TXT
 	cp $(top_builddir)/activex-vlc/src/test.html $(win32_destdir)/sdk/activex/
+endif
 endif
 
 	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) {} \;