control/media_instance.c: Avoid multiple libvlc_MediaInstanceReachedEnd, by providing...

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f6f84695c03602047c3457b737d859c557397c75..115d0994f3668fde5730bea447abec423a8b1a77 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -245,9 +245,10 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
 # Don't use it if you don't know what it is about.
 # Don't complain if it doesn't work. -- Courmisch
 libvlc:
-       cd src && $(MAKE) $(AM_MAKEFLAGS) src/libvlc.la
+       cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
 
-core: libvlc vlc$(EXEEXT)
+core:
+       cd src && $(MAKE) $(AM_MAKEFLAGS) vlc
 
 .PHONY: libvlc core
 
@@ -312,6 +313,17 @@ qvlc: make-alias
 nvlc: make-alias
        $(MKALIAS) ncurses
 
+noinst_SCRIPTS = vlc$(EXEEXT)
+
+vlc$(EXEEXT): core
+       rm -f vlc
+       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
 noinst_DATA = VLC.app
@@ -558,7 +570,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
@@ -599,7 +611,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)/"