Revert "win64: enable live again"

[vlc] / bin / Makefile.am

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 06c5d3b4f03b01d91aaa84806407a022db687e94..86d7f65596e39a5e12f8fe22340af8f4612fb570 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -33,7 +33,7 @@ vlc_wrapper_SOURCES = rootwrap.c
 vlc_wrapper_LDADD = $(SOCKET_LIBS)
 
 vlc_LDFLAGS = $(LDFLAGS_vlc)
-vlc_LDADD = ../src/libvlc.la ../src/libvlccore.la $(LIBS_vlc)
+vlc_LDADD = ../lib/libvlc.la ../src/libvlccore.la $(LIBS_vlc)
 
 vlc_static_SOURCES = $(vlc_SOURCES)
 vlc_static_CFLAGS = $(AM_CFLAGS) \
@@ -63,7 +63,7 @@ vlc_cache_gen_SOURCES = cachegen.c
 vlc_cache_gen_LDADD = \
        $(GNUGETOPT_LIBS) \
        ../compat/libcompat.la \
-       ../src/libvlc.la ../src/libvlccore.la
+       ../lib/libvlc.la ../src/libvlccore.la
 if HAVE_WIN32
 vlc_cache_gen_LDADD += vlc_win32_rc.$(OBJEXT)
 vlc_cache_gen_DEPENDENCIES = vlc_win32_rc.$(OBJEXT)
@@ -84,12 +84,3 @@ MOSTLYCLEANFILES = $(noinst_DATA)
        else \
                echo "Cross-compilation: cache generation skipped!" ; \
        fi
-
-install-exec-hook:
-       if test "$(build)" = "$(host)"; then \
-               LD_LIBRARY_PATH="$(DESTDIR)$(libdir):$$LD_LIBRARY_PATH" \
-               "$(DESTDIR)$(vlclibdir)/vlc-cache-gen$(EXEEXT)" \
-                        "$(DESTDIR)$(vlclibdir)/plugins" ; \
-       else \
-               echo "Cross-compilation: cache generation skipped!" ; \
-       fi