cli: fix many aout/vout functions

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 264e796ed8cbc906e9eafa00607b93b558bf1796..d73844b0624ece676fa9f211630f819d05ce54aa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,6 @@ endif
 SUBDIRS += test
 
 EXTRA_DIST = \
-       HACKING \
-       INSTALL.win32 \
        extras/package/win32/vlc.exe.manifest \
        extras/package/win32/libvlc.dll.manifest \
        extras/package/macosx/README.MacOSX.rtf \
@@ -28,6 +26,7 @@ EXTRA_DIST = \
        extras/package/win32/UAC.dll \
        extras/package/win32/languages/declaration.nsh \
        extras/package/win32/languages/bengali.nsh \
+       extras/package/win32/languages/basque.nsh \
        extras/package/win32/languages/brazilian_portuguese.nsh \
        extras/package/win32/languages/bulgarian.nsh \
        extras/package/win32/languages/catalan.nsh \
@@ -41,6 +40,7 @@ EXTRA_DIST = \
        extras/package/win32/languages/hungarian.nsh \
        extras/package/win32/languages/italian.nsh \
        extras/package/win32/languages/japanese.nsh \
+       extras/package/win32/languages/lithuanian.nsh \
        extras/package/win32/languages/occitan.nsh \
        extras/package/win32/languages/polish.nsh \
        extras/package/win32/languages/punjabi.nsh \
@@ -424,6 +424,7 @@ silentstd_0 = 2>&1 >/dev/null
 # use package-macosx to get a nice dmg
 VLC-release.app: vlc
        ( cd src && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd) )
+       ( cd lib && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd) )
        rm -Rf "$(top_builddir)/tmp"
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
        rm -Rf $(top_builddir)/VLC-release.app
@@ -473,19 +474,14 @@ VLC-release.app: vlc
            prefs.m \
            simple_prefs.h \
            simple_prefs.m \
-           vout.h \
-           voutgl.m \
            wizard.h \
            wizard.m \
            bookmarks.h \
            bookmarks.m \
            coredialogs.h \
            coredialogs.m \
-           embeddedwindow.h \
-           embeddedwindow.m \
            fspanel.h \
-           fspanel.m \
-           vout.m; do \
+           fspanel.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
@@ -555,8 +551,9 @@ VLC-release.app: vlc
 
 # This is just for development purposes. 
 # The resulting VLC.app will only run in this tree.
-VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.libs/libvlc.dylib
+VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/lib/.libs/libvlc.dylib
        $(AM_V_GEN)(cd src && make install $(silentstd))
+       $(AM_V_GEN)(cd lib && make install $(silentstd))
        rm -Rf $(top_builddir)/tmp
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
        rm -Rf $(top_builddir)/VLC.app
@@ -606,19 +603,14 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
            prefs.m \
            simple_prefs.h \
            simple_prefs.m \
-           vout.h \
-           voutgl.m \
            wizard.h \
            wizard.m \
            bookmarks.h \
            bookmarks.m \
            coredialogs.h \
            coredialogs.m \
-           embeddedwindow.h \
-           embeddedwindow.m \
            fspanel.h \
-           fspanel.m \
-           vout.m; do \
+           fspanel.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
        done