[vlc-devel] commit: Revert " Do not try to build the ActiveX so we can at least have nightlies." ( Jean-Paul Saman )

[git version control]

vlc | branch: master | Jean-Paul Saman <jpsaman at videolan.org> | Sun Jun  8 19:51:57 2008 +0200| [1fda54e9d2ea9ae489dbb60c0164aa0b09c610cd]

Revert "Do not try to build the ActiveX so we can at least have nightlies."

This reverts commit 097f8fc9cddf85baac0ad3083c13a85384e86e66.

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

 Makefile.am |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 66dbb51..c53f982 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ if BUILD_MOZILLA
 SUBDIRS += projects/mozilla
 endif
 if BUILD_ACTIVEX
-#FIXME:SUBDIRS += projects/activex
+SUBDIRS += projects/activex
 endif
 
 EXTRA_DIST = \
@@ -707,7 +707,7 @@ if BUILD_ACTIVEX
 	cp $(srcdir)/projects/activex/test.html  $(top_builddir)/vlc-$(VERSION)/activex/
 	unix2dos $(top_builddir)/vlc-$(VERSION)/activex/*
 
-#FIXME	cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/
+	cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/
 endif
 
 # Rebase all those DLLs to speed up loading (need cygwin rebase)
@@ -850,7 +850,7 @@ if BUILD_MOZILLA
 	$(STRIP) $(top_builddir)/vlc-$(VERSION)/mozilla/npvlc$(LIBEXT);
 endif
 if BUILD_ACTIVEX
-#FIXME	$(STRIP) $(top_builddir)/vlc-$(VERSION)/activex/axvlc$(LIBEXT);
+	$(STRIP) $(top_builddir)/vlc-$(VERSION)/activex/axvlc$(LIBEXT);
 endif
 
 package-win32-base: package-win32-base-debug package-win-common-strip