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

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 20e0b1aed75f238f504d546eaeae50345abd3821..65235fdac82bb3db7221dee902f7e742463b1144 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -11,7 +11,8 @@ NULL =
 #  - modules should come before . because vlc needs the builtins
 #  - . should come before mozilla because the plugin needs libvlc_pic.a
 #  - po should come before . because VLC.app needs the pofiles
-SUBDIRS = intl modules po . mozilla activex share m4 doc
+#  - loader should come before modules because some plugins need it
+SUBDIRS = intl loader modules po . mozilla activex share m4 doc
 DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib
 
 EXTRA_DIST = \
@@ -87,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 \
@@ -149,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 \
@@ -373,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 \
@@ -485,6 +488,26 @@ endif
          ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \
        fi ; done
 
+# the opposite of install-{data,exec}-local
+uninstall-local:
+       @for i in "" `$(VLC_CONFIG) --target plugin` ; do if test -n "$$i" ; then \
+         echo rm -f "$(DESTDIR)$(libdir)/vlc/`echo $$i | sed -e 's,.*modules/\([^/]*\).*,\1,'`/$$(basename $$i$(LIBEXT))" ; \
+         rm -f "$(DESTDIR)$(libdir)/vlc/`echo $$i | sed -e 's,.*modules/\([^/]*\).*,\1,'`/$$(basename $$i$(LIBEXT))" ; \
+       fi ; done
+       @for i in "" `$(VLC_CONFIG) --target builtin` ; do if test -n "$$i" ; then \
+         echo rm -f "$(DESTDIR)$(libdir)/vlc/$$(basename $$i)" ; \
+         rm -f "$(DESTDIR)$(libdir)/vlc/$$(basename $$i)" ; \
+       fi ; done
+if BUILD_MOZILLA
+       @for i in "" `$(VLC_CONFIG) --target builtin pic` ; do if test -n "$$i" ; then \
+         echo rm -f "$$i" "$(DESTDIR)$(libdir)/vlc/$$(basename $$i)" ; \
+         rm -f "$$i" "$(DESTDIR)$(libdir)/vlc/$$(basename $$i)" ; \
+       fi ; done
+endif
+       for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
+         rm -f "$(DESTDIR)$(bindir)/$$i" ; \
+       fi ; done
+
 if HAVE_DARWIN
 # Create the MacOS X app
 vlc_app_DATA = VLC.app
@@ -783,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/ ;