]> git.sesse.net Git - vlc/blobdiff - Makefile.am
* equalizer : [0] isn't cool, use a define.
[vlc] / Makefile.am
index e43de39fbefe6ed8eabec4b315091bddcab009d6..4dd9bece3aa2250e0a0c4829d5efdb0b64a9ef7f 100644 (file)
@@ -17,16 +17,17 @@ DIST_SUBDIRS = $(SUBDIRS) src debian ipkg lib autotools
 EXTRA_DIST = \
        HACKING \
        INSTALL.win32 \
+       vlc.exe.manifest \
        MAINTAINERS \
        README.MacOSX.rtf \
        bootstrap \
-       install-win32 \
        src/extras/COPYING \
        toolbox \
        vlc-config.in.in \
        vlc.ebuild \
        vlc.spec \
        vlc.spec.mdk \
+       vlc.win32.nsi \
        $(NULL)
 
 BUILT_SOURCES =
@@ -67,28 +68,25 @@ HEADERS_include = \
        include/aout_internal.h \
        include/audio_output.h \
        include/beos_specific.h \
-       include/configuration.h \
-       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/configuration.h \
+       include/darwin_specific.h \
        include/intf_eject.h \
        include/iso_lang.h \
-       include/httpd.h \
        include/main.h \
        include/mmx.h \
        include/modules.h \
        include/modules_inner.h \
        include/mtime.h \
        include/network.h \
+       include/osd.h \
        include/os_specific.h \
-       include/stream_control.h \
+       include/snapshot.h \
        include/stream_output.h \
        include/variables.h \
        include/video_output.h \
+       include/vlc_access.h \
        include/vlc_bits.h \
        include/vlc_block.h \
        include/vlc_block_helper.h \
@@ -96,21 +94,26 @@ HEADERS_include = \
        include/vlc_common.h \
        include/vlc_config.h \
        include/vlc_cpu.h \
+       include/vlc_demux.h \
        include/vlc_error.h \
        include/vlc_es.h \
+       include/vlc_es_out.h \
        include/vlc_help.h \
+       include/vlc_httpd.h \
+       include/vlc_input.h \
        include/vlc_interface.h \
        include/vlc_keys.h \
        include/vlc_messages.h \
        include/vlc_meta.h \
        include/vlc_objects.h \
        include/vlc_playlist.h \
-       include/vlc_threads.h \
+       include/vlc_stream.h \
        include/vlc_threads_funcs.h \
+       include/vlc_threads.h \
        include/vlc_video.h \
+       include/vlc_vlm.h \
        include/vout_synchro.h \
        include/win32_specific.h \
-       include/osd.h \
        $(NULL)
 
 HEADERS_include_built = \
@@ -234,7 +237,7 @@ EXTRA_DIST += \
        $(NULL)
 
 dist-hook:
-       mv $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild
+       cp $(distdir)/vlc.ebuild $(distdir)/vlc-${VERSION}.ebuild
        cd $(distdir) && srcdir=$(srcdir) $(srcdir)/toolbox --update-vc
 
 ###############################################################################
@@ -320,23 +323,25 @@ 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/input_info.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 \
        src/audio_output/common.c \
        src/audio_output/dec.c \
        src/audio_output/filters.c \
@@ -345,7 +350,10 @@ SOURCES_libvlc_common = \
        src/audio_output/output.c \
        src/audio_output/intf.c \
        src/stream_output/stream_output.c \
+       src/stream_output/announce.c \
+       src/stream_output/sap.c \
        src/misc/charset.c \
+       src/misc/httpd.c \
        src/misc/mtime.c \
        src/misc/block.c \
        src/misc/modules.c \
@@ -359,6 +367,7 @@ SOURCES_libvlc_common = \
        src/misc/variables.c \
        src/misc/error.c \
        src/misc/net.c \
+       src/misc/vlm.c \
        src/extras/libc.c \
        $(NULL)
 
@@ -396,14 +405,28 @@ vlc$(EXEEXT): $(vlc_OBJECTS) $(DEPENDENCIES_vlc) stamp-builtin
        esac
 
 if HAVE_BEOS
-       xres -o $@ $(srcdir)/share/vlc_beos.rsrc
-       mimeset -f $@
-       rm -Rf $(srcdir)/locale ; mkdir -p "$(srcdir)/locale"
+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
+       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/ ; \
+         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/ ; \
+         done ; \
+       fi
        for i in $(ALL_LINGUAS); do \
-         mkdir -p "$(srcdir)/locale/$${i}/LC_MESSAGES" ; \
-         cp "$(srcdir)/po/$${i}.gmo" \
-           "$(srcdir)/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \
+         mkdir -p "$(srcdir)/vlc-bundle/locale/$$i/LC_MESSAGES" ; \
+         cp "$(srcdir)/po/$$i.gmo" \
+           "$(srcdir)/vlc-bundle/locale/$$i/LC_MESSAGES/vlc.mo" || true ; \
        done
+       find $(srcdir)/vlc-bundle -type f -exec mimeset -f "{}" \;
 endif
 
 # Install the modules and the symlinks
@@ -454,8 +477,6 @@ VLC.app: vlc
            applescript.m \
            controls.h \
            controls.m \
-           info.h \
-           info.m \
            intf.h \
            intf.m \
            macosx.m \
@@ -467,6 +488,10 @@ VLC.app: vlc
            output.m \
            playlist.h \
            playlist.m \
+           playlistinfo.h \
+           playlistinfo.m \
+           prefs_widgets.h \
+           prefs_widgets.m \
            prefs.h \
            prefs.m \
            vout.h \
@@ -481,6 +506,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" ; \
@@ -498,10 +524,15 @@ VLC.app: vlc
        for i in $(srcdir)/share/http/* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/`basename $${i}` ; \
        done ; \
+       $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http/vlm
+       for i in $(srcdir)/share/http/vlm/* ; do \
+         $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/vlm/`basename $${i}` ; \
+       done ; \
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin
        for i in $(srcdir)/share/http/admin/* ; do \
          $(INSTALL) -m 644 $${i} $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin/`basename $${i}` ; \
        done ; \
+       $(INSTALL) -m 644 $(srcdir)/share/http/admin/.access $(top_builddir)/VLC.app/Contents/MacOS/share/http/admin/.access
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/locale
        for i in $(ALL_LINGUAS); do \
          mkdir -p $(top_builddir)/VLC.app/Contents/MacOS/locale/$${i}/LC_MESSAGES ; \
@@ -550,22 +581,25 @@ 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.
 #
-# Check that tmp isn't in the way
 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"; \
          false; \
        else \
          echo "OK."; mkdir -p "$(srcdir)/vlc-${VERSION}"; \
        fi
-# Create installation script
-       cp "$(srcdir)/install-win32" "$(srcdir)/vlc-${VERSION}/nsi"
+
 # Copy relevant files
+       cp "$(srcdir)/vlc.win32.nsi" "$(srcdir)/vlc-${VERSION}/"
        cp "$(top_builddir)/vlc$(EXEEXT)" "$(srcdir)/vlc-${VERSION}/"
-       cp "$(top_builddir)/vlc$(EXEEXT).manifest" "$(srcdir)/vlc-${VERSION}/"
+       cp "$(top_builddir)/vlc.exe.manifest" "$(srcdir)/vlc-${VERSION}/"
        $(STRIP) "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"
+       @if test -n "$(UPX)"; then \
+           $(UPX) -9 "$(srcdir)/vlc-${VERSION}/vlc$(EXEEXT)"; fi ;
+
        for file in AUTHORS MAINTAINERS THANKS NEWS COPYING README ; \
-         do cp "$(srcdir)/$$file" "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \
+         do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; \
          unix2dos "$(srcdir)/vlc-${VERSION}/$${file}.txt" ; done
 
        mkdir -p "$(srcdir)/vlc-${VERSION}/plugins"
@@ -576,7 +610,9 @@ package-win32-base:
          fi ; done
 
        for i in "" $(srcdir)/vlc-${VERSION}/plugins/*$(LIBEXT) ; \
-         do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; done
+         do if test -n "$$i" ; then $(STRIP) "$$i" ; fi ; \
+            if test -n "$(UPX)" -a -n "$$i"; then $(UPX) -9 "$$i"; fi ; \
+         done
 
        mkdir $(srcdir)/vlc-${VERSION}/locale
        for i in $(ALL_LINGUAS); do \
@@ -593,26 +629,44 @@ package-win32-base:
        for i in $(srcdir)/doc/skins/*.txt; do \
          cp $$i $(srcdir)/vlc-${VERSION}/skins/ || true ; \
        done
+       mkdir -p $(srcdir)/vlc-${VERSION}/skins2/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 ; \
+       done
+       for i in $(srcdir)/share/skins2/*.*; do \
+         cp $$i $(srcdir)/vlc-${VERSION}/skins2/ || 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/ ;
        cp $(srcdir)/share/http/admin/*.html \
            $(srcdir)/vlc-${VERSION}/http/admin/ ;
        cp $(srcdir)/share/http/admin/.access \
            $(srcdir)/vlc-${VERSION}/http/admin/ ;
+       cp $(srcdir)/share/http/vlm/*.html \
+           $(srcdir)/vlc-${VERSION}/http/vlm/ ;
+
+       cp $(srcdir)/share/vlc48x48.ico $(srcdir)/vlc-${VERSION}/ ;
 
        mkdir -p "$(srcdir)/vlc-${VERSION}/mozilla"
 if BUILD_MOZILLA
        cp $(srcdir)/mozilla/*$(LIBEXT) $(srcdir)/vlc-${VERSION}/mozilla/ ;
        $(STRIP) $(srcdir)/vlc-${VERSION}/mozilla/*$(LIBEXT);
+       @if test $(UPX); then \
+         $(UPX) -9 $(srcdir)/vlc-${VERSION}/mozilla/npvlc$(LIBEXT); fi ; \
        cp $(srcdir)/mozilla/vlcintf.xpt  $(srcdir)/vlc-${VERSION}/mozilla/ ;
 endif
 
 package-win32-base-exe:
 # Create package 
        wine ~/.wine/fake_windows/Program\ Files/NSIS/makensis.exe \
-             -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/nsi
+             -- /DVERSION=${VERSION} $(srcdir)/vlc-${VERSION}/vlc.win32.nsi
 
 package-win32-base-zip:
 # Create package 
@@ -641,23 +695,21 @@ package-beos:
 
 # Copy relevant files
        mkdir -p $(srcdir)/tmp/vlc ;
-       cd $(srcdir) && \
-         cp vlc AUTHORS COPYING ChangeLog README THANKS NEWS tmp/vlc/ ;
-# We cannot use ${PLUGIN_FILES} as it looks like it is too "long" for the BeOS shell...
-       if [ `find $(srcdir)/modules -name "lib*_plugin.so" | wc -l` -gt 0 ]; then \
-         mkdir -p $(srcdir)/tmp/vlc/plugins ; \
-         find $(srcdir)/modules -name "lib*_plugin.so" -exec cp {} $(srcdir)/tmp/vlc/plugins/ \; ; \
-       fi
-       for i in $(ALL_LINGUAS); do \
-         mkdir -p $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES ; \
-         cp $(srcdir)/po/$${i}.gmo $(srcdir)/tmp/vlc/locale/$${i}/LC_MESSAGES/vlc.mo || true ; \
-       done
+       cd $(srcdir) && cp -R vlc-bundle/* AUTHORS COPYING ChangeLog README \
+         THANKS NEWS tmp/vlc/ ;
+
+# Create debug package
+       xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
+       find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
+       mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
+       (cd $(srcdir)/tmp ; zip -9 -r vlc-${VERSION}-BeOS-debug.zip vlc-${VERSION} )
+       mv $(srcdir)/tmp/vlc-${VERSION}-BeOS-debug.zip $(srcdir)/ ;
+       mv $(srcdir)/tmp/vlc-${VERSION} $(srcdir)/tmp/vlc ;
 
-# Strip files and create package
+# Create normal package
        strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/vlc ;
-       if [ -d $(srcdir)/tmp/vlc/plugins ]; then \
-         strip --strip-debug --strip-unneeded $(srcdir)/tmp/vlc/plugins/lib*_plugin.so ; \
-       fi
+       find $(srcdir)/tmp/vlc -name 'lib*.so' -exec strip \
+         --strip-debug --strip-unneeded "{}" \; ;
        xres -o $(srcdir)/tmp/vlc/vlc $(srcdir)/share/vlc_beos.rsrc ;
        find $(srcdir)/tmp/vlc -exec mimeset -f {} \; ;
        mv $(srcdir)/tmp/vlc $(srcdir)/tmp/vlc-${VERSION} ;
@@ -681,11 +733,39 @@ 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
 
+package-translations:
+       @if test -e "$(srcdir)/vlc-translations-${VERSION}"; then \
+         echo "Error: please remove $(srcdir)/vlc-translations-${VERSION}, it is in the way"; \
+         false; \
+       else \
+         echo "OK."; mkdir -p "$(srcdir)/vlc-translations-${VERSION}"; \
+       fi
+# Copy translations
+       for i in $(ALL_LINGUAS); do \
+         cp "$(srcdir)/po/$${i}.po" \
+           "$(srcdir)/vlc-translations-${VERSION}/$${i}.po" \
+           || true ; \
+       done
+       cp "$(srcdir)/doc/translations.txt" \
+         "$(srcdir)/vlc-translations-${VERSION}/README.txt"
+
+       echo "#!/bin/sh" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+       echo "" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+       echo 'if test $$# != 1; then' >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+       echo "  echo \"Usage: convert-po.sh <.po file>\"" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+       echo "  exit 1" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+       echo "fi" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+       echo "" >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+       echo 'msgfmt --statistics -o vlc.mo $$1' >>"$(srcdir)/vlc-translations-$(VERSION)/convert.po.sh"
+
+       $(AMTAR) chof - $(srcdir)/vlc-translations-$(VERSION) \
+         | GZIP=$(GZIP_ENV) gzip -c >$(srcdir)/vlc-translations-$(VERSION).tar.gz
+
 ###############################################################################
 # Stamp rules
 ###############################################################################