MKV: use the new libebml macros

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f78babb4115bdaa7243cc1f939f9c59a0290e980..6cb20d6645ae4abac12758c1532fd738c3c853cf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -352,32 +352,6 @@ doc:
 
 .PHONY: libvlc core doc
 
-if HAVE_BEOS
-noinst_DATA = vlc-bundle
-vlc-bundle: vlc
-       rm -Rf $(top_builddir)/vlc-bundle ; mkdir -p $(top_builddir)/vlc-bundle
-       cp $(top_builddir)/vlc $(top_builddir)/vlc-bundle/
-       xres -o $(top_builddir)/vlc-bundle/vlc $(srcdir)/share/vlc_beos.rsrc
-       for i in "" `$(VLC_CONFIG) --target plugin` ; do \
-         if test -n "$$i" ; then \
-           mkdir -p $(top_builddir)/vlc-bundle/plugins ; \
-           cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \
-         fi ; \
-       done
-       if test -d $(CONTRIB_DIR)/vlc-lib ; then \
-         mkdir -p $(top_builddir)/vlc-bundle/lib ; \
-         for i in $(CONTRIB_DIR)/vlc-lib/*.so ; do \
-           cp $$i $(top_builddir)/vlc-bundle/lib/ ; \
-         done ; \
-       fi
-       cat $(top_srcdir)/po/LINGUAS | while read i; do \
-         mkdir -p "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES" ; \
-         cp "$(top_builddir)/po/$$i.gmo" \
-           "$(top_builddir)/vlc-bundle/share/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
-       done
-       find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
-endif
-
 ###############################################################################
 # Building aliases
 ###############################################################################
@@ -497,7 +471,7 @@ VLC-release.app: vlc
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
        $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
-        xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
+       xcodebuild -target vlc SYMROOT=../../../build DSTROOT=../../../build $(silentstd) && \
        cd ../../../../ && \
        cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \
        rm -Rf $(top_builddir)/tmp
@@ -650,7 +624,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
        $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
-       xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
+       xcodebuild -target vlc SYMROOT=../../../build DSTROOT=../../../build $(silentstd) && \
        cd ../../../../ && \
        cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC.app
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
@@ -688,7 +662,6 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 destdir=$(prefix)
 win32_destdir=$(top_builddir)/vlc-$(VERSION)
 win32_debugdir=$(top_builddir)/symbols-$(VERSION)
-win32_lua_destdir=$(win32_destdir)/lua
 win32_xpi_destdir=$(win32_destdir)/vlc-plugin
 
 if HAVE_WIN64
@@ -748,51 +721,9 @@ package-win-common: install build-npapi build-activex
        cp -r $(destdir)/lib/vlc/plugins $(win32_destdir)
 
 if BUILD_LUA
-# Copy the lua scripts (HTTP)
-       mkdir -p $(win32_lua_destdir)
-       cp -r $(destdir)/share/vlc/lua/http "$(win32_lua_destdir)/http"
-
-# Lua Scripts - cannot be simplified yet, because make install doesn't install READMEs
-       $(INSTALL) -d $(win32_lua_destdir)
-       for i in $(srcdir)/share/lua/*.* ; do \
-         $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/`basename $${i}` ; \
-       done
-       $(INSTALL) -d $(win32_lua_destdir)/modules
-       for i in $(srcdir)/share/lua/modules/*.* ; do \
-         $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/modules/`basename $${i}` ; \
-       done
-       $(INSTALL) -d $(win32_lua_destdir)/extensions
-       for i in $(srcdir)/share/lua/extensions/*.* ; do \
-         $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/extensions/`basename $${i}` ; \
-       done
-       $(INSTALL) -d $(win32_lua_destdir)/intf
-       for i in $(srcdir)/share/lua/intf/*.* ; do \
-         $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/`basename $${i}` ; \
-       done
-       $(INSTALL) -d $(win32_lua_destdir)/intf/modules
-       for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
-         $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/modules/`basename $${i}` ; \
-       done
-       $(INSTALL) -d $(win32_lua_destdir)/meta/art
-       for i in $(srcdir)/share/lua/meta/art/*.* ; do \
-         $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/art/`basename $${i}` ; \
-       done
-       $(INSTALL) -d $(win32_lua_destdir)/meta/fetcher
-       for i in $(srcdir)/share/lua/meta/fetcher/*.* ; do \
-         $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/fetcher/`basename $${i}` ; \
-       done
-       $(INSTALL) -d $(win32_lua_destdir)/meta/reader
-       for i in $(srcdir)/share/lua/meta/reader/*.* ; do \
-         $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/reader/`basename $${i}` ; \
-       done
-       $(INSTALL) -d $(win32_lua_destdir)/playlist
-       for i in $(srcdir)/share/lua/playlist/*.* ; do \
-         $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \
-       done
-       $(INSTALL) -d $(win32_lua_destdir)/sd
-       for i in $(srcdir)/share/lua/sd/*.* ; do \
-         $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/sd/`basename $${i}` ; \
-       done
+       mkdir -p $(win32_destdir)/lua
+       cp -r $(destdir)/lib/vlc/lua/* $(win32_destdir)/lua
+       cp -r $(destdir)/share/vlc/lua/* $(win32_destdir)/lua
 endif
 
 if BUILD_HTTPD
@@ -823,7 +754,7 @@ endif
        cp -r $(destdir)/include "$(win32_destdir)/sdk"
        cp -r $(destdir)/lib/pkgconfig "$(win32_destdir)/sdk/lib"
        for file in libvlc.dll.a libvlc.la libvlccore.dll.a libvlccore.la; do \
-        cp -r $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done
+        cp -rv $(destdir)/lib/$$file "$(win32_destdir)/sdk/lib"; done
 if !HAVE_WIN64
 if !HAVE_WINCE
        mkdir -p "$(win32_destdir)/sdk/activex"
@@ -838,6 +769,7 @@ endif
 if USE_PEFLAGS
        find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -print -o -name '*$(EXEEXT)' -print \) -exec $(PEFLAGS) --dynamicbase=true --nxcompat=true {} \;
 endif
+       find $(win32_destdir)/plugins/ -type f \( -name '*.a' -or -name '*.la' \) -exec rm -rvf {} \;
 
 package-win-base: package-win-common
        find $(win32_destdir) -type f \( -name '*$(LIBEXT)' -or -name '*$(EXEEXT)' \) | while read i; \