Avoid segfault in subtitle demuxer.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 5b073d009c664de971902bafde8fb678afb6f20d..19eae1a6369e98b486280f471c91f35c8513c9d6 100644 (file)
--- 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 = \
@@ -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,8 @@ 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
 
 
 ###############################################################################
@@ -401,7 +403,7 @@ VLC-release.app: vlc
        rm -Rf "$(top_builddir)/tmp"
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
        rm -Rf $(top_builddir)/VLC-release.app
-       for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+       for i in vlc.xcodeproj Resources README.MacOSX.rtf Info.plist; do \
          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
        done
        for i in AUTHORS COPYING THANKS; do \
@@ -561,7 +563,7 @@ VLC.app: vlc
        rm -Rf $(top_builddir)/tmp
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
        rm -Rf $(top_builddir)/VLC.app
-       for i in vlc.xcodeproj Resources README.MacOSX.rtf; do \
+       for i in vlc.xcodeproj Resources README.MacOSX.rtf Info.plist; do \
          cp -R $(srcdir)/extras/package/macosx/$$i $(top_builddir)/tmp/extras/package/macosx/; \
        done
        for i in AUTHORS COPYING THANKS; do \
@@ -707,7 +709,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)
@@ -842,31 +844,31 @@ 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
-#FIXME $(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
 
 package-win32-base-exe: package-win32-base
 # Create package
        if makensis -VERSION >/dev/null 2>&1; then \
-           MAKENSIS="makensis -DVERSION=$(VERSION)"; \
+           MAKENSIS="makensis"; \
        elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
-           MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=$(VERSION)"; \
+           MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis)"; \
        elif [ -x "$(PROGRAMFILES)/NSIS/makensis" ]; then \
-           MAKENSIS="$(PROGRAMFILES)/NSIS/makensis -DVERSION=$(VERSION)"; \
+           MAKENSIS="$(PROGRAMFILES)/NSIS/makensis"; \
        elif wine --version >/dev/null 2>&1; then \
-           MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=$(VERSION)"; \
+           MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe"; \
        else \
            echo 'Error: cannot locate makensis tool'; exit 1; \
        fi; \
@@ -877,7 +879,7 @@ package-win32-base-exe-cygwin: package-win32-base-exe
 
 package-win32-base-exe-linux:
 # Create package
-       makensis -DVERSION=$(VERSION) $(top_builddir)/vlc-$(VERSION)/vlc.win32.nsi
+       makensis $(top_builddir)/vlc-$(VERSION)/vlc.win32.nsi
 
 package-win32-base-zip: package-win32-base
 # Create package