Don't limit VCD Entries or LIDs to number of MPEG tracks.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f63d1d73645590d01ba6cd9b4715d5da74708be2..65235fdac82bb3db7221dee902f7e742463b1144 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -88,6 +88,7 @@ HEADERS_include = \
        include/variables.h \
        include/video_output.h \
        include/vlc_access.h \
+       include/vlc_acl.h \
        include/vlc_bits.h \
        include/vlc_block.h \
        include/vlc_block_helper.h \
@@ -150,7 +151,7 @@ endif
 EXTRA_DIST += \
        extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib \
        extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib \
-       extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib \
+       extras/MacOSX/Resources/English.lproj/MainMenu.nib/keyedobjects.nib \
        extras/MacOSX/Resources/English.lproj/About.nib/classes.nib \
        extras/MacOSX/Resources/English.lproj/About.nib/info.nib \
        extras/MacOSX/Resources/English.lproj/About.nib/keyedobjects.nib \
@@ -374,6 +375,7 @@ SOURCES_libvlc_common = \
        src/stream_output/stream_output.c \
        src/stream_output/announce.c \
        src/stream_output/sap.c \
+       src/stream_output/acl.c \
        src/misc/charset.c \
        src/misc/httpd.c \
        src/misc/tls.c \
@@ -804,8 +806,8 @@ endif
 
        mkdir -p "$(top_builddir)/vlc-${VERSION}/activex"
 if BUILD_ACTIVEX
-       cp $(top_builddir)/activex/README.TXT  $(top_builddir)/vlc-${VERSION}/activex/ ;
-       cp $(top_builddir)/activex/test.html  $(top_builddir)/vlc-${VERSION}/activex/ ;
+       cp $(srcdir)/activex/README.TXT  $(top_builddir)/vlc-${VERSION}/activex/ ;
+       cp $(srcdir)/activex/test.html  $(top_builddir)/vlc-${VERSION}/activex/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
 
        cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;