Slovenian l10n update by Matej Urbančič

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 21e7230470bb4de5837e9df4292866e977c5293d..5b073d009c664de971902bafde8fb678afb6f20d 100644 (file)
--- 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
 
@@ -69,6 +71,7 @@ AUTOMAKE_OPTIONS = \
 
 ChangeLog: Makefile.am
        rm -f -- "$@"
+       cd doc && $(MAKE) $(AM_MAKEFLAGS) changelogs
        ln -sf doc/ChangeLog-2008 "$@"
 
 ###############################################################################
@@ -348,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
@@ -704,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)
@@ -847,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