Check the return value of services_discovery_GetServicesNames.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 39d32e9fdfe656afdedb6f076a18a2be71c253b4..06ccb7bc1b5f4fc4e3ff3a2b88869db324975f30 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -313,14 +313,16 @@ qvlc: make-alias
 nvlc: make-alias
        $(MKALIAS) ncurses
 
-noinst_SCRIPTS = vlc
+noinst_SCRIPTS = vlc$(EXEEXT)
 
-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
@@ -568,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
@@ -609,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)/"