X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=5b073d009c664de971902bafde8fb678afb6f20d;hb=e42134085b4ffb63084693684a0237d592c5f06d;hp=d373e575dc66b467c2516b856086f5c629100087;hpb=87c8d9dd25ea706a53eb05deb54f32401fffa262;p=vlc

diff --git a/Makefile.am b/Makefile.am
index d373e575dc..5b073d009c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ if BUILD_MOZILLA
 SUBDIRS += projects/mozilla
 endif
 if BUILD_ACTIVEX
-SUBDIRS += projects/activex
+#FIXME:SUBDIRS += projects/activex
 endif
 
 EXTRA_DIST = \
@@ -54,7 +54,9 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
 
 SUFFIXES = 
 
-DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
+DISTCHECK_CONFIGURE_FLAGS = \
+	--enable-fast-install \
+	--disable-dvd --disable-mad --disable-libmpeg2 \
 	--disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \
 	--disable-fribidi --disable-glx
 
@@ -349,7 +351,7 @@ endif
 
 ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
 bin_SCRIPTS = $(ALIASES)
-CLEANFILES += $(ALIASES)
+CLEANFILES += $(ALIASES) $(noinst_SCRIPTS)
 EXTRA_SCRIPTS = $(ALL_ALIASES)
 
 dist_noinst_SCRIPTS += make-alias
@@ -705,7 +707,7 @@ if BUILD_ACTIVEX
 	cp $(srcdir)/projects/activex/test.html  $(top_builddir)/vlc-$(VERSION)/activex/
 	unix2dos $(top_builddir)/vlc-$(VERSION)/activex/*
 
-	cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(top_builddir)/vlc-$(VERSION)/activex/
+#FIXME	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)
@@ -848,7 +850,7 @@ if BUILD_MOZILLA
 	$(STRIP) $(top_builddir)/vlc-$(VERSION)/mozilla/npvlc$(LIBEXT);
 endif
 if BUILD_ACTIVEX
-	$(STRIP) $(top_builddir)/vlc-$(VERSION)/activex/axvlc$(LIBEXT);
+#FIXME	$(STRIP) $(top_builddir)/vlc-$(VERSION)/activex/axvlc$(LIBEXT);
 endif
 
 package-win32-base: package-win32-base-debug package-win-common-strip