TODO: removed ^M. Added some subtitle anormalites that needs to be fixed.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c563f438c85681da20c20a7cc28194a4b6b3fe1c..76cf122d1111eebaafc31ecc714947a2dae57794 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,6 +101,7 @@ HEADERS_include = \
        include/vlc_filter.h \
        include/vlc_help.h \
        include/vlc_httpd.h \
+       include/vlc_tls.h \
        include/vlc_input.h \
        include/vlc_interface.h \
        include/vlc_keys.h \
@@ -108,11 +109,14 @@ HEADERS_include = \
        include/vlc_meta.h \
        include/vlc_objects.h \
        include/vlc_playlist.h \
+       include/vlc_spu.h \
        include/vlc_stream.h \
        include/vlc_threads_funcs.h \
        include/vlc_threads.h \
        include/vlc_video.h \
        include/vlc_vlm.h \
+       include/vlc_vod.h \
+       include/vlc_xml.h \
        include/vout_synchro.h \
        include/win32_specific.h \
        $(NULL)
@@ -234,7 +238,7 @@ EXTRA_DIST += \
        evc/libvlc.vcp.in \
        evc/vlc.vcp.in \
        evc/plugins.vcp.in \
-       evc/vlc.c \
+       evc/errno.h \
        evc/config.h.in \
        evc/modules_builtin_evc.h \
        $(NULL)
@@ -322,10 +326,11 @@ SOURCES_libvlc_common = \
        src/playlist/playlist.c \
        src/playlist/sort.c \
        src/playlist/loadsave.c \
-       src/playlist/group.c \
+       src/playlist/view.c \
        src/playlist/item.c \
        src/playlist/item-ext.c \
        src/playlist/info.c \
+       src/playlist/services_discovery.c \
        src/input/access.c \
        src/input/clock.c \
        src/input/control.c \
@@ -335,6 +340,7 @@ SOURCES_libvlc_common = \
        src/input/input.c \
        src/input/input_internal.h \
        src/input/stream.c \
+       src/input/mem_stream.c \
        src/input/subtitles.c \
        src/input/var.c \
        src/video_output/video_output.c \
@@ -357,6 +363,7 @@ SOURCES_libvlc_common = \
        src/stream_output/sap.c \
        src/misc/charset.c \
        src/misc/httpd.c \
+       src/misc/tls.c \
        src/misc/mtime.c \
        src/misc/block.c \
        src/misc/modules.c \
@@ -371,6 +378,7 @@ SOURCES_libvlc_common = \
        src/misc/error.c \
        src/misc/net.c \
        src/misc/vlm.c \
+       src/misc/xml.c \
        src/extras/libc.c \
        $(NULL)
 
@@ -408,28 +416,29 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin
        esac
 
 if HAVE_BEOS
+noinst_DATA = vlc-bundle
 vlc-bundle: vlc
-       rm -Rf $(srcdir)/vlc-bundle ; mkdir -p $(srcdir)/vlc-bundle
-       cp $(srcdir)/vlc $(srcdir)/vlc-bundle/
-       xres -o $(srcdir)/vlc-bundle/vlc $(srcdir)/share/vlc_beos.rsrc
+       rm -Rf $(top_builddir)/vlc-bundle ; mkdir -p $(top_builddir)/vlc-bundle
+       cp $(top_builddir)/vlc $(top_builddir)/vlc-bundle/
+       xres -o $(top_builddir)/vlc-bundle/vlc $(srcdir)/share/vlc_beos.rsrc
        for i in "" `$(VLC_CONFIG) --target plugin` ; do \
          if test -n "$$i" ; then \
-           mkdir -p $(srcdir)/vlc-bundle/plugins ; \
-           cp "$$i$(LIBEXT)" $(srcdir)/vlc-bundle/plugins/ ; \
+           mkdir -p $(top_builddir)/vlc-bundle/plugins ; \
+           cp "$$i$(LIBEXT)" $(top_builddir)/vlc-bundle/plugins/ ; \
          fi ; \
        done
-       if test -d $(srcdir)/extras/contrib/vlc-lib ; then \
-         mkdir -p $(srcdir)/vlc-bundle/lib ; \
-         for i in $(srcdir)/extras/contrib/vlc-lib/*.so ; do \
-           cp $$i $(srcdir)/vlc-bundle/lib/ ; \
+       if test -d $(top_builddir)/extras/contrib/vlc-lib ; then \
+         mkdir -p $(top_builddir)/vlc-bundle/lib ; \
+         for i in $(top_builddir)/extras/contrib/vlc-lib/*.so ; do \
+           cp $$i $(top_builddir)/vlc-bundle/lib/ ; \
          done ; \
        fi
        for i in $(ALL_LINGUAS); do \
-         mkdir -p "$(srcdir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \
-         cp "$(srcdir)/po/$$i.gmo" \
-           "$(srcdir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
+         mkdir -p "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \
+         cp "$(top_builddir)/po/$$i.gmo" \
+           "$(top_builddir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
        done
-       find $(srcdir)/vlc-bundle -type f -exec mimeset -f "{}" \;
+       find $(top_builddir)/vlc-bundle -type f -exec mimeset -f "{}" \;
 endif
 
 # Install the modules and the symlinks
@@ -500,6 +509,8 @@ VLC.app: vlc
            prefs.h \
            prefs.m \
            vout.h \
+           voutqt.m \
+           voutgl.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -623,23 +634,12 @@ package-win32-base:
             || true ; \
        done
 
-       mkdir -p $(srcdir)/vlc-${VERSION}/skins/default
-       for i in $(srcdir)/share/skins/default/*.*; do \
-         cp $$i $(srcdir)/vlc-${VERSION}/skins/default/ || true ; \
-       done
-       for i in $(srcdir)/doc/skins/*.txt; do \
-         cp $$i $(srcdir)/vlc-${VERSION}/skins/ || true ; \
-       done
-       mkdir -p $(srcdir)/vlc-${VERSION}/skins2/fonts
+       mkdir -p $(srcdir)/vlc-${VERSION}/skins/fonts
        for i in $(srcdir)/share/skins2/fonts/*.*; do \
-         cp $$i $(srcdir)/vlc-${VERSION}/skins2/fonts/ || true ; \
-       done
-       mkdir -p $(srcdir)/vlc-${VERSION}/skins2/default
-       for i in $(srcdir)/share/skins2/default/*.*; do \
-         cp $$i $(srcdir)/vlc-${VERSION}/skins2/default/ || true ; \
+         cp $$i $(srcdir)/vlc-${VERSION}/skins/fonts/ || true ; \
        done
        for i in $(srcdir)/share/skins2/*.*; do \
-         cp $$i $(srcdir)/vlc-${VERSION}/skins2/ || true ; \
+         cp $$i $(srcdir)/vlc-${VERSION}/skins/ || true ; \
        done
 
        mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin"
@@ -665,7 +665,7 @@ endif
 package-win32-base-exe:
 # Create package 
        wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \
-             -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/vlc.win32.nsi
+             /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/vlc.win32.nsi
 
 package-win32-base-zip:
 # Create package