Better ACL API (full rewrite)

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a2c152b2d9720a2a21165814b83ea75319b5a05b..fb349c8a66e3b1c644412f93914b1bbd47571c54 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 \
@@ -159,6 +161,9 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/English.lproj/Preferences.nib/classes.nib \
        extras/MacOSX/Resources/English.lproj/Preferences.nib/info.nib \
        extras/MacOSX/Resources/English.lproj/Preferences.nib/keyedobjects.nib \
+       extras/MacOSX/Resources/English.lproj/Wizard.nib/classes.nib \
+       extras/MacOSX/Resources/English.lproj/Wizard.nib/info.nib \
+       extras/MacOSX/Resources/English.lproj/Wizard.nib/keyedobjects.nib \
        extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
        extras/MacOSX/Resources/a52.icns \
        extras/MacOSX/Resources/aac.icns \
@@ -370,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 \
@@ -482,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
@@ -532,6 +558,8 @@ VLC-release.app: vlc
            vout.h \
            voutqt.m \
            voutgl.m \
+           wizard.h \
+           wizard.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -629,6 +657,8 @@ VLC.app: vlc
            vout.h \
            voutqt.m \
            voutgl.m \
+           wizard.h \
+           wizard.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -765,7 +795,7 @@ package-win32-base:
            $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
 
-       cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
+       cp $(srcdir)/share/vlc48x48new.ico $(top_builddir)/vlc-${VERSION}/ ;
 
        mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
 if BUILD_MOZILLA
@@ -776,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/ ;