addMediaDescriptor refactored to addMedia

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 06ccb7bc1b5f4fc4e3ff3a2b88869db324975f30..870250f3f57ccdf12d57f60ef246a7fd0f917521 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -289,7 +289,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,7 +315,9 @@ qvlc: make-alias
 nvlc: make-alias
        $(MKALIAS) ncurses
 
+if BUILD_VLC
 noinst_SCRIPTS = vlc$(EXEEXT)
+endif
 
 vlc$(EXEEXT): core
        rm -f vlc$(EXEEXT)
@@ -326,7 +330,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 )
@@ -619,8 +625,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 \