Fix V4L2 typo

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cff608998179f7f587280ad84811f03920d0acc1..6e4720663a1d2e0517ce61dc32b8b1e55c8289e5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,27 +7,12 @@
 # which have makefiles with distribution information.
 #  - src (libvlc) is nedeed by modules
 #  - libs/* are needed by modules
-BASE_SUBDIRS = po compat src bin modules share doc test
-EXTRA_SUBDIRS = m4 \
-       libs/loader libs/srtp libs/unzip
-DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
-
-SUBDIRS = po compat src
-if LOADER
-SUBDIRS += libs/loader
-endif
-if HAVE_GCRYPT
-SUBDIRS += libs/srtp
-endif
-if HAVE_ZLIB
-if !HAVE_MINIZIP
-SUBDIRS += libs/unzip
-endif
-endif
+DIST_SUBDIRS = m4 compat doc po share src modules lib bin test
+SUBDIRS = compat doc po share src modules lib
 if BUILD_VLC
 SUBDIRS += bin
 endif
-SUBDIRS += modules share doc test
+SUBDIRS += test
 
 EXTRA_DIST = \
        HACKING \
@@ -43,6 +28,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 \
@@ -56,6 +42,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 \
@@ -360,8 +347,11 @@ MAINTAINERCLEANFILES = ChangeLog
 libcompat:
        cd compat && $(MAKE) $(AM_MAKEFLAGS)
 
-libvlc: libcompat
-       cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
+libvlccore: libcompat
+       cd src && $(MAKE) $(AM_MAKEFLAGS) libvlccore.la
+
+libvlc: libvlccore
+       cd lib && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
 
 core: libvlc vlc$(EXEEXT)
        cd bin && $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT) vlc-static$(EXEEXT)
@@ -416,6 +406,18 @@ noinst_DATA = VLC.app
 endif
 endif
 
+###############################################################################
+# Installing plugins cache
+###############################################################################
+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
+
 silentstd = $(silentstd_$(V))
 silentstd_ = $(silentstd_$(AM_DEFAULT_VERBOSITY))
 silentstd_0 = 2>&1 >/dev/null
@@ -424,6 +426,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 +476,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 +553,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 +605,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