IPv6 support for HTTPd

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a4c6c077d19d1b80c8126b5055dea8f9295a1e37..79d2a612528609677dd14f13ebb7c25d909dba10 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -72,10 +72,11 @@ HEADERS_include = \
        include/darwin_specific.h \
        include/charset.h \
        include/codecs.h \
-       include/ninput.h \
-       include/input_ext-dec.h \
-       include/input_ext-intf.h \
-       include/input_ext-plugins.h \
+       include/vlc_es_out.h \
+       include/vlc_input.h \
+       include/vlc_access.h \
+       include/vlc_stream.h \
+       include/vlc_demux.h \
        include/intf_eject.h \
        include/iso_lang.h \
        include/vlc_httpd.h \
@@ -86,7 +87,7 @@ HEADERS_include = \
        include/mtime.h \
        include/network.h \
        include/os_specific.h \
-       include/stream_control.h \
+       include/snapshot.h \
        include/stream_output.h \
        include/variables.h \
        include/video_output.h \
@@ -322,21 +323,22 @@ SOURCES_libvlc_common = \
        src/playlist/item.c \
        src/playlist/item-ext.c \
        src/playlist/info.c \
-       src/input/input.c \
+       src/input/access.c \
+       src/input/clock.c \
        src/input/control.c \
+       src/input/decoder.c \
+       src/input/demux.c \
        src/input/es_out.c \
+       src/input/input.c \
+       src/input/input_internal.h \
        src/input/stream.c \
-       src/input/demux.c \
        src/input/subtitles.c \
-       src/input/input_ext-plugins.c \
-       src/input/input_ext-intf.c \
-       src/input/input_dec.c \
-       src/input/input_programs.c \
-       src/input/input_clock.c \
+       src/input/var.c \
        src/video_output/video_output.c \
        src/video_output/vout_pictures.c \
        src/video_output/vout_pictures.h \
        src/video_output/video_text.c \
+       src/video_output/video_widgets.c \
        src/video_output/vout_subpictures.c \
        src/video_output/vout_synchro.c \
        src/video_output/vout_intf.c \
@@ -461,8 +463,6 @@ VLC.app: vlc
            applescript.m \
            controls.h \
            controls.m \
-           info.h \
-           info.m \
            intf.h \
            intf.m \
            macosx.m \
@@ -492,6 +492,7 @@ VLC.app: vlc
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
        $(INSTALL) $(top_builddir)/vlc \
                   $(top_builddir)/VLC.app/Contents/MacOS/VLC
+       ln -sf ./VLC $(top_builddir)/VLC.app/Contents/MacOS/clivlc
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
        for i in "" `$(VLC_CONFIG) --target plugin` ; do \
          if test -n "$$i" ; \
@@ -720,7 +721,7 @@ package-macosx:
        cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/
 
 # Create disk image 
-       $(srcdir)/extras/MacOSX/macosx-dmg 25 "vlc-${VERSION}" $(top_builddir)/tmp/* 
+       $(srcdir)/extras/MacOSX/macosx-dmg "vlc-${VERSION}" $(top_builddir)/tmp
 
 # Clean up
        rm -Rf $(top_builddir)/tmp