X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=ba9b3968ecfab1d155c589eb2e03a937210af76e;hb=2e6b98b531998094cb0138cf77dadcf9d3a4c66f;hp=8ea647fa87fe8693a517ab2249752a0ebae46210;hpb=e55650d5397fe8c1faa1920c79e8d32cb0cb0512;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 8ea647fa87..ba9b3968ec 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)
@@ -78,7 +78,11 @@ EXTRA_DIST = \
 dist_noinst_SCRIPTS = bootstrap toolbox
 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,7 +107,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = \
-	1.9 \
+	1.11 \
 	-Wall \
 	check-news \
 	dist-bzip2 \
@@ -910,7 +914,7 @@ package-win32-7zip: package-win32-base-7zip package-win32-cleanup
 
 package-win32-debug-7zip: package-win32-base-debug-7zip package-win32-cleanup
 
-package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe package-win32-xpi package-win32-crx
+package-win32-no-clean: package-win32-base-zip package-win32-base-7zip package-win32-base-exe package-win32-xpi
 
 package-win32: package-win32-no-clean package-win32-cleanup