Use RFC4648 test vectors

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d6fe2ffe4ef1342b0bcef1896f6b226c9f76118a..2d70a0a483bbbb498d4d60f4eccad2ff951dede0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -204,7 +204,7 @@ EXTRA_DIST += \
        $(NULL)
 
 ###############################################################################
-# Various utilities ( editor syntax files, ... )
+# Various utilities ( editor syntax files, D-Bus controller ... )
 ##############################################################################
 EXTRA_DIST += \
        extras/Makefile \
@@ -214,6 +214,8 @@ EXTRA_DIST += \
        extras/make.pl \
        extras/valgrind.suppressions \
        extras/m4/autoconf260.m4 \
+       extras/dbus-vlc.py \
+       extras/dbus-vlc.glade \
        $(NULL)
 
 ###############################################################################
@@ -265,7 +267,7 @@ bin_PROGRAMS = vlc
 
 vlc_SOURCES = src/vlc.c
 # Ugly kludge so that automake defines $(CXXLINK)
-EXTRA_vlc_SOURCES = extras/zsh.cpp
+nodist_EXTRA_vlc_SOURCES = extras/zsh.cpp src/misc/darwin_specific.m
 
 # Work around a bug in the arm-wince-pe linker
 if HAVE_WINCE
@@ -284,13 +286,9 @@ LIB_libvlc = libvlc.la
 LIBVLC = src/$(LIB_libvlc)
 vlc_LDFLAGS =
 else
-if BUILD_SHARED
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc
 if HAVE_WIN32
+vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -Wl,-rpath $(libdir) -L$(top_builddir)/src -lvlc
 LIB_libvlc = libvlc.dll.a
-else
-LIB_libvlc = libvlc$(LIBEXT)
-endif
 LIBVLC =
 else
 vlc_LDFLAGS = $(vlc_WORKAROUNDLFDLAGS) `$(VLC_CONFIG) --libs vlc builtin`
@@ -307,7 +305,8 @@ endif
 libvlc:
        cd src && $(MAKE) $(AM_MAKEFLAGS) $(LIB_libvlc)
 
-core: libvlc vlc$(EXEEXT)
+core: libvlc
+       $(MAKE) $(AM_MAKEFLAGS) vlc$(EXEEXT)
 
 .PHONY: libvlc core
 
@@ -352,9 +351,10 @@ endif
 
 # Install the symlinks
 install-exec-local: install-binPROGRAMS
+       inst="`echo vlc | sed -e '$(transform)'`" ; \
        for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
          rm -f "$(DESTDIR)$(bindir)/$$i" && \
-         ln -sf vlc "$(DESTDIR)$(bindir)/$$i" ; \
+         ln -sf "$${inst}" "$(DESTDIR)$(bindir)/$$i" ; \
        fi ; done
 
 # the opposite of install-{data,exec}-local
@@ -667,9 +667,7 @@ package-win-common:
 # Copy relevant files
        cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
        cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
-if BUILD_SHARED
        cp "src/libvlc$(LIBEXT)" "vlc-${VERSION}/"
-endif
 
        for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
          do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \
@@ -736,9 +734,7 @@ endif
 
 package-win-common-strip:
        $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
-if BUILD_SHARED
        $(STRIP) "vlc-${VERSION}/libvlc$(LIBEXT)"
-endif
 if BUILD_MOZILLA
        $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
 endif
@@ -826,7 +822,9 @@ package-win32-7zip: package-win32-base-7zip
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}
 
-package-win32: package-win32-base-exe package-win32-base-zip
+package-win32-no-clean: package-win32-base-exe package-win32-base-zip package-win32-base-7zip
+
+package-win32: package-win32-no-clean
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}