Avoid segfault in subtitle demuxer.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 2fb57814bc9b2e8681676f42a772d85ecd24f977..19eae1a6369e98b486280f471c91f35c8513c9d6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -56,6 +56,7 @@ SUFFIXES =
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --enable-fast-install \
+       --disable-dbus \
        --disable-dvd --disable-mad --disable-libmpeg2 \
        --disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \
        --disable-fribidi --disable-glx
@@ -268,7 +269,7 @@ EXTRA_DIST += \
        extras/package/macosx/eyetvplugin/eyetvplugin.h \
        extras/package/macosx/eyetvplugin/English.lproj/InfoPlist.strings \
        extras/package/macosx/eyetvplugin/eyetvplugin.xcodeproj/project.pbxproj \
-       extras/package/macosx/README.MacOSX.rtf
+       extras/package/macosx/README.MacOSX.rtf \
        extras/package/macosx/Info.plist
 
 
@@ -843,18 +844,18 @@ if BUILD_OSDMENU
        done
 endif
 
-package-win-common-strip:
-       $(STRIP) "$(top_builddir)/vlc-$(VERSION)/vlc$(EXEEXT)"
+package-win-common-strip: package-win32-base-debug
+       $(STRIP) "vlc-$(VERSION)/vlc$(EXEEXT)"
        $(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)"
        $(STRIP) "vlc-$(VERSION)/libvlc$(LIBEXT)"
 if BUILD_MOZILLA
-       $(STRIP) $(top_builddir)/vlc-$(VERSION)/mozilla/npvlc$(LIBEXT);
+       $(STRIP) "vlc-$(VERSION)/mozilla/npvlc$(LIBEXT)"
 endif
 if BUILD_ACTIVEX
-       $(STRIP) $(top_builddir)/vlc-$(VERSION)/activex/axvlc$(LIBEXT);
+       $(STRIP) "vlc-$(VERSION)/activex/axvlc$(LIBEXT)"
 endif
 
-package-win32-base: package-win32-base-debug package-win-common-strip
+package-win32-base: package-win-common-strip
        for i in "" $(top_builddir)/vlc-$(VERSION)/plugins/*$(LIBEXT) ; \
          do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done