Dummy activex/npapi build rules for Windows CE / Windows 64bits

Move the rules from {npapi,activex}.am to /Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 7b63bcfcce11a1cf4dc0370fbc8e17b2797507c7..c6ad867bc3df4fb9df77863296d57a7533b218b5 100644 (file)
--- 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

diff --git a/extras/package/activex.am b/extras/package/activex.am
index fa8e560d37a795b14e8afc095324f350c2b49b65..2b482b5374d703bfb3f91bfeafe34a20cb840b38 100644 (file)
--- a/extras/package/activex.am
+++ b/extras/package/activex.am
@@ -1,11 +1,6 @@
 #! /usr/bin/make -f
 
-if HAVE_WIN64
-build-activex:
-       touch $@
-else
 build-activex: stamp-activex-build
-endif
 
 stamp-activex-fetch:
        rm -Rf activex-vlc

diff --git a/extras/package/npapi.am b/extras/package/npapi.am
index 28bc359f048beacbefcf31f87c47b15c10deee9a..6b058b65d67c36df03e0cf0756bac41332d43291 100644 (file)
--- a/extras/package/npapi.am
+++ b/extras/package/npapi.am
@@ -1,11 +1,6 @@
 #! /usr/bin/make -f
 
-if HAVE_WIN64
-build-npapi:
-       touch $@
-else
 build-npapi: stamp-npapi-build
-endif
 
 stamp-npapi-fetch:
        rm -Rf npapi-vlc