X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=88d5703b6bec0363add71f6054d36678fa87c5fb;hb=f3401b31c0e584315071db863f2217ffa223d5c5;hp=4a06b1e43a9fd497159ddf65f56d859071a6f1db;hpb=a7954388b00c3f2c83bb25d97b75f1a3a470868b;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 4a06b1e43a..88d5703b6b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -217,7 +217,6 @@ EXTRA_DIST += \
 	extras/analyser/vlc.vim \
 	extras/analyser/valgrind.suppressions \
 	extras/buildsystem/make.pl \
-	extras/buildsystem/autotools/m4/autoconf260.m4 \
 	extras/misc/mpris.py \
 	extras/misc/mpris.glade
 
@@ -289,7 +288,9 @@ endif
 ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
 bin_SCRIPTS += $(ALIASES)
 CLEANFILES += $(ALIASES)
+if BUILD_VLC
 EXTRA_SCRIPTS = $(ALL_ALIASES)
+endif
 
 dist_noinst_SCRIPTS += make-alias
 
@@ -313,10 +314,12 @@ qvlc: make-alias
 nvlc: make-alias
 	$(MKALIAS) ncurses
 
-#noinst_SCRIPTS = vlc
+if BUILD_VLC
+noinst_SCRIPTS = vlc$(EXEEXT)
+endif
 
 vlc$(EXEEXT): core
-	rm -f vlc
+	rm -f vlc$(EXEEXT)
 	ln -s src/vlc$(EXEEXT)
 #	rm -f -- vlc vlc.tmp
 #	echo '#! /bin/sh' > vlc.tmp
@@ -326,7 +329,9 @@ vlc$(EXEEXT): core
 
 if HAVE_DARWIN
 # Create the MacOS X app
+if BUILD_VLC
 noinst_DATA = VLC.app
+endif
 # VLC-release.app is the old VLC.app target
 VLC-release.app: vlc
 	( cd src && make install )
@@ -570,7 +575,7 @@ VLC.app: vlc
 	          $(top_builddir)/VLC.app
 	rm -Rf $(top_builddir)/tmp
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
-	$(INSTALL) $(top_builddir)/.libs/vlc \
+	$(INSTALL) $(top_builddir)/src/.libs/vlc \
 		   $(top_builddir)/VLC.app/Contents/MacOS/VLC
 	ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc
 	$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
@@ -611,7 +616,7 @@ package-win-common:
 	fi
 
 # Copy relevant files
-	cp "$(top_builddir)/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/"
+	cp "$(top_builddir)/src/.libs/vlc$(EXEEXT)" "$(top_builddir)/vlc-$(VERSION)/"
 	cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(top_builddir)/vlc-$(VERSION)/"
 	cp "$(top_builddir)/src/.libs/libvlc$(LIBEXT)" "vlc-$(VERSION)/"
 	cp "$(top_builddir)/src/.libs/libvlc-control$(LIBEXT)" "vlc-$(VERSION)/"
@@ -619,8 +624,8 @@ package-win-common:
 	for file in AUTHORS MAINTAINERS THANKS ; \
 	  do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-$(VERSION)/$${file}.txt" ; done;
 	for file in NEWS COPYING README; \
-	   do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done
-	  unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
+	  do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done
+	unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
 
 	mkdir $(top_builddir)/vlc-$(VERSION)/locale
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \