Merge branch 'master' into lpcm_encoder

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8cd2199f14fb0598713f1b4e25a496aa49d30880..e366e9a516b4f828304ccb4cb22cf9b9077d2aa5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,7 +8,7 @@
 #  - src (libvlc) is nedeed by modules, mozilla and bindings
 #  - libs/* are needed by modules
 BASE_SUBDIRS = po compat src bin modules share doc test
-EXTRA_SUBDIRS = m4 extras/package/ipkg \
+EXTRA_SUBDIRS = m4 \
        libs/loader libs/srtp libs/unzip \
        projects/mozilla projects/activex
 DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
@@ -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,10 +74,14 @@ 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 extras/package/win32/vlc.win32.nsi extras/package/win32/spad.nsi
+BUILT_SOURCES_distclean = vlc-config
+if HAVE_WIN32
+BUILT_SOURCES_distclean += \
+       extras/package/win32/vlc.win32.nsi extras/package/win32/spad.nsi
+endif
 if HAVE_DARWIN
 BUILT_SOURCES_clean = macosx-sdk
 else
@@ -106,7 +109,7 @@ AUTOMAKE_OPTIONS = \
        1.11 \
        -Wall \
        check-news \
-       dist-bzip2 \
+       dist-xz \
        no-dist-gzip
 #      std-options
 
@@ -324,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
 ###############################################################################