[vlc-commits] commit: Dummy activex/npapi build rules for Windows CE / Windows 64bits ( Rafaël Carré )

[git at videolan.org]

vlc | branch: master | Rafaël Carré <rafael.carre at gmail.com> | Wed Oct 20 12:42:32 2010 +0200| [56a914d8936b46d7d4deb854e9a0ac9db76417dd] | committer: Rafaël Carré 

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

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

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

 Makefile.am               |   16 ++++++++++++++++
 extras/package/activex.am |    5 -----
 extras/package/npapi.am   |    5 -----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 7b63bcf..c6ad867 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
diff --git a/extras/package/activex.am b/extras/package/activex.am
index fa8e560..2b482b5 100644
--- 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 28bc359..6b058b6 100644
--- 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