libvlc: Unify volume/mute change functions and add a mutex layer

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index e28142fa9b3921ca01376103c999c87e155dbd51..20c2576ae2d4ef19cdeee9c85433100da121638b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -410,7 +410,7 @@ vlc$(EXEEXT):
        ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
 
 if HAVE_DARWIN
-if BUILD_VLC
+if BUILD_MACOSX_VLC_APP
 # Create the MacOS X app
 noinst_DATA = VLC.app
 endif
@@ -788,6 +788,8 @@ if BUILD_LUA
        unix2dos $(win32_lua_destdir)/http/*.css
        cp $(srcdir)/share/lua/http/js/*.js $(win32_lua_destdir)/http/js/
        unix2dos $(win32_lua_destdir)/http/js/*.js
+       cp $(srcdir)/share/lua/http/*.lua $(win32_lua_destdir)/http/
+       unix2dos $(win32_lua_destdir)/http/*.lua
        cp $(srcdir)/share/lua/http/dialogs/* $(win32_lua_destdir)/http/dialogs/
        unix2dos $(win32_lua_destdir)/http/dialogs/*
        cp $(srcdir)/share/lua/http/dialogs/.hosts $(win32_lua_destdir)/http/dialogs/
@@ -810,9 +812,13 @@ if BUILD_LUA
        for i in $(srcdir)/share/lua/playlist/*.* ; do \
          $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \
        done
-       $(INSTALL) -d $(win32_lua_destdir)/meta
-       for i in $(srcdir)/share/lua/meta/*.* ; do \
-         $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/`basename $${i}` ; \
+       $(INSTALL) -d $(win32_lua_destdir)/meta/art
+       for i in $(srcdir)/share/lua/meta/art/*.lua ; do \
+         $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/art/`basename $${i}` ; \
+       done
+       $(INSTALL) -d $(win32_lua_destdir)/meta/reader
+       for i in $(srcdir)/share/lua/meta/reader/*.lua ; do \
+         $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/reader/`basename $${i}` ; \
        done
        $(INSTALL) -d $(win32_lua_destdir)/intf
        for i in $(srcdir)/share/lua/intf/*.* ; do \
@@ -901,6 +907,8 @@ package-win-common-strip: package-win32-base-debug
          echo "OK."; mkdir -p "$(win32_debugdir)"; \
        fi
        for i in "" $(win32_destdir)/*$(LIBEXT) \
+                   $(win32_destdir)/activex/*$(LIBEXT) \
+                   $(win32_destdir)/mozilla/*$(LIBEXT) \
                    $(win32_destdir)/plugins/*$(LIBEXT) \
        ; do \
          if test -n "$$i" ; then \