addMediaDescriptor refactored to addMedia

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 39d32e9fdfe656afdedb6f076a18a2be71c253b4..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,18 +315,24 @@ qvlc: make-alias
 nvlc: make-alias
        $(MKALIAS) ncurses
 
-noinst_SCRIPTS = vlc
+if BUILD_VLC
+noinst_SCRIPTS = vlc$(EXEEXT)
+endif
 
-vlc: core
-       rm -f -- vlc vlc.tmp
-       echo '#! /bin/sh' > vlc.tmp
-       echo 'exec "$$(dirname "$$0")/src/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
-       chmod +x vlc.tmp
-       mv -f -- vlc.tmp vlc
+vlc$(EXEEXT): core
+       rm -f vlc$(EXEEXT)
+       ln -s src/vlc$(EXEEXT)
+#      rm -f -- vlc vlc.tmp
+#      echo '#! /bin/sh' > vlc.tmp
+#      echo 'exec "$$(dirname "$$0")/src/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
+#      chmod +x vlc.tmp
+#      mv -f -- vlc.tmp vlc
 
 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 )
@@ -568,7 +576,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
@@ -609,7 +617,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)/"
@@ -617,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 \