Don't use a directory for a lone file

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index cc652844a8bf44df050dbfd7ec173b8aafc201a8..cd406791215d2e73d54c92c9fafbdcf2196adcc7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,12 +2,6 @@
 # Automake targets and declarations
 ###############################################################################
 
-# Pass --quiet to make when we are not verbose.
-AM_MAKEFLAGS = $(makesilentflags_$(V))
-makesilentflags_ = $(makesilentflags__$(AM_DEFAULT_VERBOSITY))
-makesilentflags_0 = --quiet
-makesilentflags__0 = $(makesilentflags_0)
-
 # SUBDIRS stores the directories where a "make" is required when building
 # something. DIST_SUBDIRS stores the directories where nothing is built but
 # which have makefiles with distribution information.
@@ -74,9 +68,12 @@ SUFFIXES =
 
 DISTCHECK_CONFIGURE_FLAGS = \
        --enable-fast-install \
+       --disable-a52 \
+       --disable-avcodec --disable-avformat \
+       --disable-postproc --disable-swscale \
        --disable-dbus \
-       --disable-dvd --disable-mad --disable-libmpeg2 \
-       --disable-ffmpeg --disable-faad --disable-skins2 \
+       --disable-mad --disable-libmpeg2 \
+       --disable-faad --disable-skins2 \
        --disable-live555 \
        --disable-fribidi --disable-glx
 
@@ -341,10 +338,6 @@ doc:
 
 .PHONY: libvlc core doc
 
-#To get some nice output
-nice:
-       $(top_builddir)/compile
-
 if HAVE_BEOS
 noinst_DATA = vlc-bundle
 vlc-bundle: vlc
@@ -385,29 +378,29 @@ dist_noinst_SCRIPTS += make-alias
 MKALIAS = bindir="$(bindir)" transform="$(transform)" program_prefix="$(program_prefix)" program_suffix="$(program_suffix)" $(top_srcdir)/make-alias $@
 
 cvlc: make-alias Makefile
-       $(MKALIAS) dummy
+       $(AM_V_GEN)$(MKALIAS) dummy
 
 rvlc: make-alias Makefile
-       $(MKALIAS) rc
+       $(AM_V_GEN)$(MKALIAS) rc
 
 svlc: make-alias Makefile
-       $(MKALIAS) skins2
+       $(AM_V_GEN)$(MKALIAS) skins2
 
 qvlc: make-alias Makefile
-       $(MKALIAS) qt4
+       $(AM_V_GEN)$(MKALIAS) qt4
 
 nvlc: make-alias Makefile
-       $(MKALIAS) ncurses
+       $(AM_V_GEN)$(MKALIAS) ncurses
 
 mvlc: make-alias Makefile
-       $(MKALIAS) maemo
+       $(AM_V_GEN)$(MKALIAS) maemo
 
 if BUILD_VLC
 noinst_SCRIPTS += vlc$(EXEEXT)
 endif
 
 vlc$(EXEEXT):
-       ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
+       $(AM_V_GEN)ln -sf bin/vlc-static$(EXEEXT) vlc$(EXEEXT)
 
 if HAVE_DARWIN
 if BUILD_MACOSX_VLC_APP
@@ -417,10 +410,8 @@ endif
 endif
 
 silentstd = $(silentstd_$(V))
-silentstd_ = $(silentstd__$(AM_DEFAULT_VERBOSITY))
+silentstd_ = $(silentstd_$(AM_DEFAULT_VERBOSITY))
 silentstd_0 = 2>&1 >/dev/null
-# '__' prefix trick for old automake version.
-silentstd__0 = $(silentstd_0)
 
 # VLC-release.app for packaging and giving it to your friends
 # use package-macosx to get a nice dmg
@@ -708,6 +699,7 @@ package-win-common:
 # Copy relevant files
 # Copy executables, major libs+manifests
        cp "$(top_builddir)/bin/.libs/vlc$(EXEEXT)" "$(win32_destdir)/"
+       cp "$(top_builddir)/bin/.libs/vlc-cache-gen$(EXEEXT)" "$(win32_destdir)/"
        cp "$(top_srcdir)/extras/package/win32/vlc.exe.manifest" "$(win32_destdir)/"
        cp "$(top_srcdir)/extras/package/win32/libvlc.dll.manifest" "$(win32_destdir)/"
        cp "$(top_builddir)/src/.libs/libvlccore$(LIBEXT)" "$(win32_destdir)/"
@@ -728,8 +720,7 @@ package-win-common:
        cat $(top_srcdir)/po/LINGUAS | while read i; do \
          mkdir -p "$(win32_destdir)/locale/$${i}/LC_MESSAGES" ; \
          cp "$(srcdir)/po/$${i}.gmo" \
-           "$(win32_destdir)/locale/$${i}/LC_MESSAGES/vlc.mo" \
-            || true ; \
+           "$(win32_destdir)/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \
        done
        mkdir -p $(win32_destdir)/locale/qt4/
        cp $(QT4LOCALEDIR)/*.qm $(win32_destdir)/locale/qt4/ || true
@@ -747,7 +738,6 @@ if BUILD_ACTIVEX
        cp $(srcdir)/projects/activex/README.TXT  $(win32_destdir)/activex/
        cp $(srcdir)/projects/activex/test.html  $(win32_destdir)/activex/
        unix2dos $(win32_destdir)/activex/*
-
        cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/
        cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
 endif
@@ -833,10 +823,18 @@ if BUILD_LUA
        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)/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
        $(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}` ; \