X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=e366e9a516b4f828304ccb4cb22cf9b9077d2aa5;hb=12ade3e3bc975d5426ba4af155b7372c31093b31;hp=d3ec3fe5a9a50b98f4b65a0a47da9bb8921cb464;hpb=f0582d9d61ddac10d431d61103eb5c49024094f1;p=vlc

diff --git a/Makefile.am b/Makefile.am
index d3ec3fe5a9..e366e9a516 100644
--- 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
@@ -103,10 +106,10 @@ DISTCHECK_CONFIGURE_FLAGS = \
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = \
-	1.9 \
+	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
 ###############################################################################