]> git.sesse.net Git - vlc/blobdiff - Makefile.am
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Remove playlist info accessors (as they now belong to input_item) and use vlc_input_i...
[vlc] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index 20049570a4e42abb845d9ef5b16b10c833fc71f1..18ebfa19dc535493d7c2195089a3ef77e1fee8a7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -99,8 +99,10 @@ HEADERS_include = \
        include/vlc_es.h \
        include/vlc_es_out.h \
        include/vlc_filter.h \
-       include/vlc_help.h \
+       include/vlc_config_cat.h \
        include/vlc_httpd.h \
+       include/vlc_tls.h \
+       include/vlc_image.h \
        include/vlc_input.h \
        include/vlc_interface.h \
        include/vlc_keys.h \
@@ -115,6 +117,7 @@ HEADERS_include = \
        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)
@@ -236,7 +239,6 @@ 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 \
@@ -325,10 +327,10 @@ 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 \
@@ -338,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 \
@@ -360,12 +363,14 @@ 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 \
        src/misc/threads.c \
        src/misc/cpu.c \
        src/misc/configuration.c \
+       src/misc/image.c \
        src/misc/iso_lang.c \
        src/misc/iso-639_def.h \
        src/misc/messages.c \
@@ -374,6 +379,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)
 
@@ -511,7 +517,7 @@ VLC.app: vlc
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
        cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'
-       cp -r $(top_builddir)/tmp/extras/MacOSX/build/vlc.bundle \
+       cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
              $(top_builddir)/VLC.app
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
@@ -594,73 +600,78 @@ remove_distdir_woody = \
 #
 package-win32-base:
 # Check that tmp isn't in the way
-       @if test -e "$(srcdir)/vlc-${VERSION}"; then \
-         echo "Error: please remove $(srcdir)/vlc-${VERSION}, it is in the way"; \
+       @if test -e "$(top_builddir)/vlc-${VERSION}"; then \
+         echo "Error: please remove $(top_builddir)/vlc-${VERSION}, it is in the way"; \
          false; \
        else \
-         echo "OK."; mkdir -p "$(srcdir)/vlc-${VERSION}"; \
+         echo "OK."; mkdir -p "$(top_builddir)/vlc-${VERSION}"; \
        fi
 
 # Copy relevant files
-       cp "$(srcdir)/vlc.win32.nsi" "$(srcdir)/vlc-${VERSION}/"
-       cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/"
-       cp "$(top_builddir)/vlc.exe.manifest" "$(srcdir)/vlc-${VERSION}/"
-       $(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"
+       cp "$(srcdir)/vlc.win32.nsi" "$(top_builddir)/vlc-${VERSION}/"
+       cp "$(top_builddir)/vlc$(EXEEXT)" "$(top_builddir)/vlc-${VERSION}/"
+       cp "$(top_srcdir)/vlc.exe.manifest" "$(top_builddir)/vlc-${VERSION}/"
+       $(STRIP) "$(top_builddir)/vlc-${VERSION}/vlc$(EXEEXT)"
 
        for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
-         do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \
-         unix2dos "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; done
+         do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \
+         unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done
 
-       mkdir -p "$(srcdir)/vlc-${VERSION}/plugins"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/plugins"
        for i in "" `$(VLC_CONFIG) --target plugin` ; do \
          if test -n "$$i" ; then \
-           $(INSTALL) "$(srcdir)/$$i$(LIBEXT)" \
-            "$(srcdir)/vlc-${VERSION}/plugins/" ; \
+           $(INSTALL) "$(top_builddir)/$$i$(LIBEXT)" \
+            "$(top_builddir)/vlc-${VERSION}/plugins/" ; \
          fi ; done
 
-       for i in "" $(srcdir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
+       for i in "" $(top_builddir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
          do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
 
-       mkdir $(srcdir)/vlc-${VERSION}/locale
+       mkdir $(top_builddir)/vlc-${VERSION}/locale
        for i in $(ALL_LINGUAS); do \
-         mkdir -p "$(srcdir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \
+         mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \
          cp "$(srcdir)/po/$${i}.gmo" \
-           "$(srcdir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \
+           "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \
             || true ; \
        done
 
-       mkdir -p $(srcdir)/vlc-${VERSION}/skins/fonts
+       mkdir -p $(top_builddir)/vlc-${VERSION}/skins/fonts
        for i in $(srcdir)/share/skins2/fonts/*.*; do \
-         cp $$i $(srcdir)/vlc-${VERSION}/skins/fonts/ || true ; \
+         cp $$i $(top_builddir)/vlc-${VERSION}/skins/fonts/ || true ; \
        done
        for i in $(srcdir)/share/skins2/*.*; do \
-         cp $$i $(srcdir)/vlc-${VERSION}/skins/ || true ; \
+         cp $$i $(top_builddir)/vlc-${VERSION}/skins/ || true ; \
        done
 
-       mkdir -p "$(srcdir)/vlc-${VERSION}/http/admin"
-       mkdir -p "$(srcdir)/vlc-${VERSION}/http/vlm"
-       cp $(srcdir)/share/http/*.html $(srcdir)/vlc-${VERSION}/http/ ;
-       cp $(srcdir)/share/http/*.css $(srcdir)/vlc-${VERSION}/http/ ;
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm"
+       cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
+       cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
        cp $(srcdir)/share/http/admin/*.html \
-           $(srcdir)/vlc-${VERSION}/http/admin/ ;
+           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
        cp $(srcdir)/share/http/admin/.access \
-           $(srcdir)/vlc-${VERSION}/http/admin/ ;
+           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
        cp $(srcdir)/share/http/vlm/*.html \
-           $(srcdir)/vlc-${VERSION}/http/vlm/ ;
+           $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
 
-       cp $(srcdir)/share/vlc48x48.ico $(srcdir)/vlc-${VERSION}/ ;
+       cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
-       mkdir -p "$(srcdir)/vlc-${VERSION}/mozilla"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
 if BUILD_MOZILLA
-       cp $(srcdir)/mozilla/*$(LIBEXT) $(srcdir)/vlc-${VERSION}/mozilla/ ;
-       $(STRIP) $(srcdir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
-       cp $(srcdir)/mozilla/vlcintf.xpt  $(srcdir)/vlc-${VERSION}/mozilla/ ;
+       cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
+       $(STRIP) $(top_builddir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
+       cp $(top_builddir)/mozilla/vlcintf.xpt  $(top_builddir)/vlc-${VERSION}/mozilla/ ;
 endif
 
 package-win32-base-exe:
-# Create package 
+# Create package
        wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \
-             /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/vlc.win32.nsi
+             /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
+
+package-win32-base-exe-cygwin:
+# Create package
+       C:/Program\ Files/NSIS/makensis.exe \
+             /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
 
 package-win32-base-zip:
 # Create package 
@@ -668,15 +679,15 @@ package-win32-base-zip:
 
 package-win32-exe: package-win32-base package-win32-base-exe
 # Clean up
-       rm -Rf $(srcdir)/vlc-${VERSION}
+       rm -Rf $(top_builddir)/vlc-${VERSION}
 
 package-win32-zip: package-win32-base package-win32-base-zip
 # Clean up
-       rm -Rf $(srcdir)/vlc-${VERSION}
+       rm -Rf $(top_builddir)/vlc-${VERSION}
 
 package-win32: package-win32-base package-win32-base-exe package-win32-base-zip
 # Clean up
-       rm -Rf $(srcdir)/vlc-${VERSION}
+       rm -Rf $(top_builddir)/vlc-${VERSION}
 
 package-beos:
 # Check that tmp isn't in the way
@@ -763,7 +774,7 @@ package-translations:
 ###############################################################################
 # Stamp rules
 ###############################################################################
-clean: clean-stamp
+clean: clean-stamp clean-recursive
 clean-stamp:
        rm -f stamp-builtin
 
Unnamed repository; edit this file 'description' to name the repository.