]> git.sesse.net Git - vlc/blobdiff - Makefile.am
Use a hash for stats. Not finished
[vlc] / Makefile.am
index 70d213ab70a220de0076df0907dae53144ea671f..139dba4f9c0e0d2d0abad6033ca1d73f9433194d 100644 (file)
@@ -33,9 +33,10 @@ EXTRA_DIST = \
        src/misc/modules_builtin.h.in \
        $(NULL)
 
-BUILT_SOURCES_distclean = vlc-config
+BUILT_SOURCES_distclean = vlc-config compile
 BUILT_SOURCES_clean = \
        stamp-api \
+       macosx-sdk \
        src/misc/modules_builtin.h \
        src/misc/version.c \
        $(NULL)
@@ -44,6 +45,9 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
 
 SUFFIXES = 
 
+DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
+       --disable-ffmpeg --disable-faad --disable-skins2
+
 # Tell aclocal to use -I m4. Wonder if it really works.
 ACLOCAL_AMFLAGS = -I m4
 
@@ -59,13 +63,15 @@ pkgincludedir = $(includedir)/vlc
 
 dist_pkginclude_HEADERS = \
        include/vlc/vlc.h \
+       include/vlc/libvlc.h \
        include/vlc/aout.h \
        include/vlc/vout.h \
        include/vlc/sout.h \
        include/vlc/decoder.h \
        include/vlc/input.h \
        include/vlc/intf.h \
-       include/vlc/control.h \
+       include/vlc/mediacontrol.h \
+       include/vlc/mediacontrol_structures.h \
        $(NULL)
 
 noinst_HEADERS = $(HEADERS_include)
@@ -112,6 +118,7 @@ HEADERS_include = \
        include/vlc_md5.h \
        include/vlc_image.h \
        include/vlc_input.h \
+       include/vlc_interaction.h \
        include/vlc_interface.h \
        include/vlc_keys.h \
        include/vlc_messages.h \
@@ -124,12 +131,15 @@ HEADERS_include = \
        include/vlc_symbols.h \
        include/vlc_threads_funcs.h \
        include/vlc_threads.h \
+       include/vlc_update.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 \
+       include/libvlc_internal.h \
+       include/mediacontrol_internal.h
        $(NULL)
 
 src/misc/modules_builtin.h: Makefile src/misc/modules_builtin.h.in vlc-config
@@ -247,7 +257,6 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/vlc.scriptTerminology \
        extras/MacOSX/Resources/README \
        extras/MacOSX/vlc.pbproj/project.pbxproj \
-       extras/MacOSX/macosx-dmg \
        extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \
        extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \
        extras/MacOSX/Delete_Preferences.app/Contents/MacOS/applet \
@@ -297,15 +306,13 @@ vlc-config.in: vlc-config.in.in
 
 MOSTLYCLEANFILES = $(DATA_noinst_libvlc)
 CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
-DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in
+DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
 
+lib_LIBRARIES = lib/libvlc.a $(lib_PICLIBRARIES)
 if HAVE_WIN32
-lib_LIBRARIES = lib/libvlc.a
 else
-lib_LIBRARIES = lib/libvlc.a
 if BUILD_PIC
-lib_LIBRARIES += lib/libvlc_pic.a
-else
+lib_PICLIBRARIES = lib/libvlc_pic.a
 endif
 endif
 
@@ -393,6 +400,7 @@ SOURCES_libvlc_common = \
        src/libvlc.h \
        src/interface/interface.c \
        src/interface/intf_eject.c \
+       src/interface/interaction.c \
        src/playlist/playlist.c \
        src/playlist/sort.c \
        src/playlist/loadsave.c \
@@ -430,19 +438,25 @@ 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/osd/osd.c \
        src/osd/osd_parser.c \
        src/osd/osd_text.c \
        src/osd/osd_widgets.c \
+       src/network/acl.c \
+       src/network/getaddrinfo.c \
+       src/network/io.c \
+       src/network/tcp.c \
+       src/network/udp.c \
+       src/network/httpd.c \
+       src/network/rootwrap.c \
+       src/network/tls.c \
        src/misc/charset.c \
-       src/misc/httpd.c \
-       src/misc/tls.c \
        src/misc/md5.c \
        src/misc/mtime.c \
        src/misc/block.c \
        src/misc/modules.c \
        src/misc/threads.c \
+       src/misc/stats.c \
        src/misc/unicode.c \
        src/misc/cpu.c \
        src/misc/configuration.c \
@@ -453,17 +467,23 @@ SOURCES_libvlc_common = \
        src/misc/objects.c \
        src/misc/variables.c \
        src/misc/error.c \
-       src/misc/net.c \
-       src/misc/getaddrinfo.c \
+       src/misc/update.c \
        src/misc/vlm.c \
        src/misc/xml.c \
+       src/misc/hashtables.c \
        src/misc/version.c \
        src/extras/libc.c \
        src/control/core.c \
-       src/control/util.c \
-       src/control/audio_video.c \
+       src/control/playlist.c \
+       src/control/input.c \
+       src/control/mediacontrol_core.c \
+       src/control/mediacontrol_util.c \
+       src/control/mediacontrol_audio_video.c \
        $(NULL)
 
+# These should be distributed, but not compiled
+EXTRA_DIST += src/control/mediacontrol_init.c src/control/mediacontrol_plugin.c
+
 SOURCES_libvlc = \
        $(SOURCES_libvlc_common) \
        $(OPT_SOURCES_libvlc_beos) \
@@ -545,7 +565,7 @@ endif
 install-exec-local:
        for i in "" $(ALIASES) ; do if test -n "$$i" ; then \
          rm -f "$(DESTDIR)$(bindir)/$$i" && \
-         ln -s vlc "$(DESTDIR)$(bindir)/$$i" ; \
+         ln -sf vlc "$(DESTDIR)$(bindir)/$$i" ; \
        fi ; done
        test -z "$(DATA_noinst_libvlc)" || $(INSTALL_PROGRAM) "$(DATA_noinst_libvlc)" "$(DESTDIR)$(libdir)"
 
@@ -574,8 +594,6 @@ VLC-release.app: vlc
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
        mkdir -p $(top_builddir)/tmp/modules/audio_output
-       cp $(srcdir)/modules/audio_output/coreaudio.c \
-          $(top_builddir)/tmp/modules/audio_output/coreaudio.c
        mkdir -p $(top_builddir)/tmp/modules/gui/macosx
        for i in \
            about.h \
@@ -654,15 +672,6 @@ VLC-release.app: vlc
        for i in $(srcdir)/share/http/* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/`basename $${i}` ; \
        done ; \
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/vlm
-       for i in $(srcdir)/share/http/vlm/* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/vlm/`basename $${i}` ; \
-       done ; \
-       $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/admin
-       for i in $(srcdir)/share/http/admin/* ; do \
-         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/admin/`basename $${i}` ; \
-       done ; \
-       $(INSTALL) -m 644 $(srcdir)/share/http/admin/.access $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/admin/.access
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/locale
        for i in $(ALL_LINGUAS); do \
          mkdir -p $(top_builddir)/VLC-release.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
@@ -690,8 +699,6 @@ VLC.app: vlc
          cp "$(srcdir)/$$i" $(top_builddir)/tmp; \
        done
        mkdir -p $(top_builddir)/tmp/modules/audio_output
-       cp $(srcdir)/modules/audio_output/coreaudio.c \
-          $(top_builddir)/tmp/modules/audio_output/coreaudio.c
        mkdir -p $(top_builddir)/tmp/modules/gui/macosx
        for i in \
            about.h \
@@ -813,7 +820,7 @@ remove_distdir_woody = \
 # XXX: this rule is probably only useful to you if you have exactly
 # the same setup as me. Contact sam@zoy.org if you need to use it.
 #
-package-win32-base:
+package-win32-base-debug:
 # Check that tmp isn't in the way
        @if test -e "$(top_builddir)/vlc-${VERSION}"; then \
          echo "Error: please remove $(top_builddir)/vlc-${VERSION}, it is in the way"; \
@@ -839,9 +846,6 @@ package-win32-base:
             "$(top_builddir)/vlc-${VERSION}/plugins/" ; \
          fi ; done
 
-       for i in "" $(top_builddir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
-         do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
-
        mkdir $(top_builddir)/vlc-${VERSION}/locale
        for i in $(ALL_LINGUAS); do \
          mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \
@@ -870,25 +874,35 @@ package-win32-base:
        sed -i 's%share/osdmenu%osdmenu%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg
        sed -i 's%/%\\%g' $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg 
 
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/dialogs"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/vlm"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin"
        cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;:
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
        cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
-       cp $(srcdir)/share/http/*.png $(top_builddir)/vlc-${VERSION}/http/
+       cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-${VERSION}/http/js/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/js/*.js ;
+       cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-${VERSION}/http/dialogs/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/* ;
        cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ;
-       cp $(srcdir)/share/http/admin/*.html \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/*.html ;
-       cp $(srcdir)/share/http/admin/dboxfiles.html \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-       cp $(srcdir)/share/http/admin/.access \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/.access ;
-       cp $(srcdir)/share/http/vlm/*.html \
-           $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
+       cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/
+       cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ;
+
+       cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ;
+       cp $(srcdir)/share/http/old/*.ico $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ;
+       cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ;
 
        cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
@@ -909,19 +923,30 @@ if BUILD_ACTIVEX
        $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
 endif
 # Rebase all those DLLs to speed up loading (need cygwin rebase)
-       if [ -x rebase ]; then \
+       if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \
                find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
        fi
 
+package-win32-base: package-win32-base-debug
+       for i in "" $(top_builddir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
+         do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
+
+
 package-win32-base-exe:
 # Create package
-       wine C:/Program\ Files/NSIS/makensis.exe \
-             /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
+       if makensis -VERSION >/dev/null 2>&1; then \
+           MAKENSIS="makensis -DVERSION=${VERSION}"; \
+       elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
+           MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis /DVERSION=${VERSION}"; \
+       elif wine --version >dev/null 2>&1; then \
+           MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe /DVERSION=${VERSION}"; \
+       else \
+           echo 'Error: cannot locate makensis tool'; exit 1; \
+       fi; \
+       eval "$$MAKENSIS $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi"
 
-package-win32-base-exe-cygwin:
+package-win32-base-exe-cygwin: package-win32-base-exe
 # Create package
-       C:/Program\ Files/NSIS/makensis.exe \
-             /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
 
 package-win32-base-exe-linux:
 # Create package
@@ -974,25 +999,35 @@ package-wince-base:
        done
 
 
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/admin"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/vlm"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/js"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/dialogs"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/vlm"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/old/admin"
        cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-${VERSION}/http/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/*.html ;
        cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-${VERSION}/http/ ;
        unix2dos $(top_builddir)/vlc-${VERSION}/http/*.css ;
-       cp $(srcdir)/share/http/*.png $(top_builddir)/vlc-${VERSION}/http/
+       cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-${VERSION}/http/js/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/js/*.js ;
+       cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-${VERSION}/http/dialogs/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/dialogs/* ;
        cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ;
-       cp $(srcdir)/share/http/admin/*.html \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/*.html ;
-       cp $(srcdir)/share/http/admin/dboxfiles.html \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-       cp $(srcdir)/share/http/admin/.access \
-           $(top_builddir)/vlc-${VERSION}/http/admin/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/admin/.access ;
-       cp $(srcdir)/share/http/vlm/*.html \
-           $(top_builddir)/vlc-${VERSION}/http/vlm/ ;
-       unix2dos $(top_builddir)/vlc-${VERSION}/http/vlm/*.html ;
+       cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-${VERSION}/http/images/
+       cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-${VERSION}/http/requests/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/requests/*.xml ;
+
+       cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/old/*.html ;
+       cp $(srcdir)/share/http/old/*.ico $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-${VERSION}/http/old/ ;
+       cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-${VERSION}/http/old/vlm/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/old/vlm/*.html ;
+       cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-${VERSION}/http/old/admin/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/old/admin/*.html ;
 
        cp $(srcdir)/share/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
@@ -1013,7 +1048,7 @@ if BUILD_ACTIVEX
        $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
 endif
 # Rebase all those DLLs to speed up loading (need cygwin rebase)
-       if [ -x rebase ]; then \
+       if rebase -b 0x42 /dev/null >/dev/null 2>&1; then \
                find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
        fi
 
@@ -1062,23 +1097,28 @@ package-beos:
        rm -Rf $(srcdir)/tmp ;
 
 package-macosx:
-# Check that tmp isn't in the way
-       @if test -e "$(top_builddir)/tmp"; then \
-         echo "Error: please remove $(top_builddir)/tmp, it is in the way"; \
-         false; \
-       else \
-         echo "OK."; mkdir -p "$(top_builddir)/tmp"; \
+# Check that the temporary location isn't in the way
+       @if test -e "$(top_builddir)/vlc-${VERSION}/"; then \
+         rm -Rf "$(top_builddir)/vlc-${VERSION}/" ; \
        fi
 
+       echo "Create package directory: vlc-${VERSION}/";
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/";
+
 # Copy relevant files 
-       cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/tmp/VLC.app"
-       cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/ && cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/tmp/
+       cp -R "$(top_builddir)/VLC-release.app" "$(top_builddir)/vlc-${VERSION}/VLC.app"
+       cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/vlc-${VERSION}/ && cp -R extras/MacOSX/Delete_Preferences.app $(top_builddir)/vlc-${VERSION}/
 
 # Create disk image 
-       $(srcdir)/extras/MacOSX/macosx-dmg "vlc-${VERSION}" $(top_builddir)/tmp
+       echo "Creating disk image" ;
+       rm -f "$(top_builddir)/vlc-${VERSION}.dmg" ;
+       hdiutil create -srcfolder "$(top_builddir)/vlc-${VERSION}" \
+         "$(top_builddir)/vlc-${VERSION}.dmg" -format UDZO -quiet ;
+       echo; echo "Disk image creation completed:" ;
+       ls -la "$(top_builddir)/vlc-${VERSION}.dmg" ; echo ;
 
 # Clean up
-       rm -Rf $(top_builddir)/tmp
+       rm -Rf "$(top_builddir)/vlc-${VERSION}" ;
 
 package-translations:
        @if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \
@@ -1151,6 +1191,12 @@ stamp-api: Makefile.in $(HEADERS_include) vlc-config vlc-api.pl
          top_srcdir="$(top_srcdir)" perl $(top_srcdir)/vlc-api.pl
        touch stamp-api
 
+###############################################################################
+# Enforce Mac OS X deployment target environment variable
+###############################################################################
+macosx-sdk: Makefile.in $(HEADERS_include) vlc-config vlc-api.pl
+       export MACOSX_DEPLOYMENT_TARGET=$(MACOSX_DEPLOYMENT_TARGET)
+
 ###############################################################################
 # Force rule
 ###############################################################################