Merge branch 'master' into lpcm_encoder

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 3f610cab6467c2d9735530d0f904088adc118711..e366e9a516b4f828304ccb4cb22cf9b9077d2aa5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -39,7 +39,6 @@ endif
 EXTRA_DIST = \
        HACKING \
        INSTALL.win32 \
-       INSTALL.wince \
        extras/package/win32/vlc.exe.manifest \
        extras/package/win32/libvlc.dll.manifest \
        extras/package/macosx/README.MacOSX.rtf \
@@ -75,7 +74,7 @@ EXTRA_DIST = \
        extras/package/win32/languages/sorani.nsh \
        extras/package/win32/languages/spanish.nsh
 
-dist_noinst_SCRIPTS = bootstrap toolbox
+dist_noinst_SCRIPTS = bootstrap
 nodist_noinst_SCRIPTS = compile
 
 BUILT_SOURCES_distclean = vlc-config
@@ -328,9 +327,6 @@ EXTRA_DIST += \
        extras/misc/mpris.py \
        extras/misc/mpris.glade
 
-dist-hook:
-       distdir=$(distdir) srcdir=$(srcdir) $(SHELL) $(srcdir)/toolbox --dist-contrib
-
 ###############################################################################
 # Building libvlc
 ###############################################################################