Initial Services discovery support

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 310c55a05e15cbbf2b59a358b4fd90efe0ebd781..fbba9cf22231e71fcc1c1d08e3dd965b52a91ac2 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,13 @@ 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/vout_synchro.h \
        include/win32_specific.h \
        $(NULL)
@@ -235,6 +238,7 @@ EXTRA_DIST += \
        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 \
@@ -357,6 +362,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 \
@@ -408,7 +414,7 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin
        esac
 
 if HAVE_BEOS
-vlc_app_DATA = vlc-bundle
+noinst_DATA = vlc-bundle
 vlc-bundle: vlc
        rm -Rf $(top_builddir)/vlc-bundle ; mkdir -p $(top_builddir)/vlc-bundle
        cp $(top_builddir)/vlc $(top_builddir)/vlc-bundle/
@@ -501,6 +507,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; \
@@ -624,23 +632,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"
@@ -666,7 +663,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