]> git.sesse.net Git - vlc/blobdiff - Makefile.am
remove unneeded includes
[vlc] / Makefile.am
index 1a41a747d00c2e53fb937ab787bfb84331db28c2..c9a6dc67d2b1b7e0bf39ae953ea8a49158fb0f37 100644 (file)
@@ -9,15 +9,16 @@ NULL =
 # which have makefiles with distribution information.
 #  - intl should come before modules and . because all the code uses gettext
 #  - modules should come before . because vlc needs the builtins
-#  - . should come before mozilla because the plugin needs libvlc_pic.a
+#  - . should come before mozilla/bindings because the plugin needs libvlc_pic.a
 #  - po should come before . because VLC.app needs the pofiles
 #  - loader should come before modules because some plugins need it
-SUBDIRS = intl loader modules po . mozilla activex share m4 doc
+SUBDIRS = intl loader modules po . mozilla bindings activex share m4 doc
 DIST_SUBDIRS = $(SUBDIRS) debian ipkg lib
 
 EXTRA_DIST = \
        HACKING \
        INSTALL.win32 \
+       INSTALL.wince \
        vlc.exe.manifest \
        MAINTAINERS \
        README.MacOSX.rtf \
@@ -32,7 +33,7 @@ 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 \
        src/misc/modules_builtin.h \
@@ -43,6 +44,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
 
@@ -65,6 +69,7 @@ dist_pkginclude_HEADERS = \
        include/vlc/input.h \
        include/vlc/intf.h \
        include/vlc/control.h \
+       include/vlc/control_structures.h \
        $(NULL)
 
 noinst_HEADERS = $(HEADERS_include)
@@ -86,7 +91,6 @@ HEADERS_include = \
        include/modules_inner.h \
        include/mtime.h \
        include/network.h \
-       include/osd.h \
        include/os_specific.h \
        include/snapshot.h \
        include/stream_output.h \
@@ -112,6 +116,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 \
@@ -181,9 +186,9 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/English.lproj/Extended.nib/classes.nib \
        extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib \
        extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib \
-       extras/MacOSX/Resources/English.lproj/Update.nib/classes.nib \
-       extras/MacOSX/Resources/English.lproj/Update.nib/info.nib \
-       extras/MacOSX/Resources/English.lproj/Update.nib/keyedobjects.nib \
+       extras/MacOSX/Resources/English.lproj/SFilters.nib/classes.nib \
+       extras/MacOSX/Resources/English.lproj/SFilters.nib/info.nib \
+       extras/MacOSX/Resources/English.lproj/SFilters.nib/keyedobjects.nib \
        extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
        extras/MacOSX/Resources/a52.icns \
        extras/MacOSX/Resources/aac.icns \
@@ -248,7 +253,13 @@ EXTRA_DIST += \
        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 \
+       extras/MacOSX/Delete_Preferences.app/Contents/Resources/description.rtfd/TXT.rtf \
+       extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.icns \
+       extras/MacOSX/Delete_Preferences.app/Contents/Resources/applet.rsrc \
+       extras/MacOSX/Delete_Preferences.app/Contents/Resources/Scripts/main.scpt \
        extras/Makefile \
        extras/zsh.cpp \
        $(NULL)
@@ -291,18 +302,15 @@ 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
 
 if HAVE_WIN32
 lib_LIBRARIES = lib/libvlc.a
 else
-if BUILD_SHARED
-lib_LIBRARIES = lib/libvlc_pic.a
-else
 lib_LIBRARIES = lib/libvlc.a
-if BUILD_MOZILLA
+if BUILD_PIC
 lib_LIBRARIES += lib/libvlc_pic.a
-endif
+else
 endif
 endif
 
@@ -390,6 +398,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 \
@@ -427,13 +436,19 @@ 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_widgets.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 \
@@ -449,8 +464,6 @@ 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/vlm.c \
        src/misc/xml.c \
        src/misc/version.c \
@@ -460,6 +473,9 @@ SOURCES_libvlc_common = \
        src/control/audio_video.c \
        $(NULL)
 
+# These should be distributed, but not compiled
+EXTRA_DIST += src/control/init.c src/control/plugin.c
+
 SOURCES_libvlc = \
        $(SOURCES_libvlc_common) \
        $(OPT_SOURCES_libvlc_beos) \
@@ -541,7 +557,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)"
 
@@ -565,13 +581,11 @@ VLC-release.app: vlc
          echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
        fi
        rm -Rf $(top_builddir)/VLC-release.app
-       cp -r $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
+       cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
        for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
          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 \
@@ -606,10 +620,10 @@ VLC-release.app: vlc
            wizard.m \
            extended.h \
            extended.m \
-        bookmarks.h \
-        bookmarks.m \
-           update.h \
-           update.m \
+           bookmarks.h \
+           bookmarks.m \
+           sfilters.h \
+           sfilters.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -617,15 +631,15 @@ VLC-release.app: vlc
        case $(target_triplet) in \
          *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
            cd ../../../; \
-           cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+           cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
                  $(top_builddir)/VLC-release.app;; \
          *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
            cd ../../../; \
-           cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+           cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
                  $(top_builddir)/VLC-release.app;; \
          *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
            cd ../../../; \
-           cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
+           cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
                  $(top_builddir)/VLC-release.app;; \
        esac
        rm -Rf $(top_builddir)/tmp
@@ -650,15 +664,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 ; \
@@ -681,13 +686,11 @@ VLC.app: vlc
          echo "OK."; mkdir -p "$(top_builddir)/tmp/extras"; \
        fi
        rm -Rf $(top_builddir)/VLC.app
-       cp -r $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
+       cp -R $(srcdir)/extras/MacOSX $(top_builddir)/tmp/extras
        for i in AUTHORS COPYING README.MacOSX.rtf THANKS; do \
          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 \
@@ -722,10 +725,10 @@ VLC.app: vlc
            wizard.m \
            extended.h \
            extended.m \
-        bookmarks.h \
-        bookmarks.m \
-           update.h \
-           update.m \
+           bookmarks.h \
+           bookmarks.m \
+           sfilters.h \
+           sfilters.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -733,15 +736,15 @@ VLC.app: vlc
        case $(target_triplet) in \
          *darwin6*) cd $(top_builddir)/tmp/extras/MacOSX && pbxbuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
            cd ../../../; \
-           cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+           cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
                  $(top_builddir)/VLC.app;; \
          *darwin7*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
            cd ../../../; \
-           cp -r $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
+           cp -R $(top_builddir)/tmp/extras/MacOSX/build/VLC.bundle \
                  $(top_builddir)/VLC.app;; \
          *darwin8*) cd $(top_builddir)/tmp/extras/MacOSX && xcodebuild -target vlc | grep -v '^\([ \t]\|$$\)'; \
            cd ../../../; \
-           cp -r $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
+           cp -R $(top_builddir)/tmp/extras/MacOSX/build/Default/VLC.bundle \
                  $(top_builddir)/VLC.app;; \
        esac
        rm -Rf $(top_builddir)/tmp
@@ -855,69 +858,31 @@ package-win32-base:
        done
 
        mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selected"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/unselect"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selection"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/dvd/volume"
-       for i in $(srcdir)/share/osdmenu/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/ || true ; \
-         unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/`basename $$i` ; \
-       done
-       for i in $(srcdir)/share/osdmenu/dvd/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd || true ; \
-       done
-       for i in $(srcdir)/share/osdmenu/dvd/unselect/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/unselect || true ; \
-       done
-       for i in $(srcdir)/share/osdmenu/dvd/selected/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selected/ || true ; \
-       done
-       for i in $(srcdir)/share/osdmenu/dvd/selection/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/selection/ || true ; \
-       done
-       for i in $(srcdir)/share/osdmenu/dvd/volume/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/dvd/volume/ || true ; \
-       done
-
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/selected"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/selection"
-       mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/default/volume"
-       for i in $(srcdir)/share/osdmenu/default/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default || true ; \
-       done
-       for i in $(srcdir)/share/osdmenu/default/selected/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/selected/ || true ; \
-       done
-       for i in $(srcdir)/share/osdmenu/default/selection/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/selection/ || true ; \
-       done
-       for i in $(srcdir)/share/osdmenu/default/volume/*.*; do \
-         cp $$i $(top_builddir)/vlc-${VERSION}/osdmenu/default/volume/ || true ; \
+       cp $(srcdir)/share/osdmenu/*.* "$(top_builddir)/vlc-${VERSION}/osdmenu"
+       for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume;do \
+               mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir"; \
+               for file in $(srcdir)/share/osdmenu/$${dir}/*.*;do \
+                        cp $$file "$(top_builddir)/vlc-${VERSION}/osdmenu/$$dir" || true; \
+               done; \
        done
+       unix2dos $(top_builddir)/vlc-${VERSION}/osdmenu/*.cfg;
+       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"
        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 $(top_builddir)/vlc-${VERSION}/http/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/*.js ;
        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/vlc48x48new.ico $(top_builddir)/vlc-${VERSION}/ ;
+       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/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
 
        mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
 if BUILD_MOZILLA
@@ -942,13 +907,19 @@ endif
 
 package-win32-base-exe:
 # Create package
-       wine C:/Program\ Files/NSIS/makensis.exe \
-             /DVERSION=${VERSION} $(top_builddir)/vlc-${VERSION}/vlc.win32.nsi
+       if [ -x makensis ]; then \
+           MAKENSIS=makensis; \
+       elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
+           MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \
+       elif [ -x wine ]; then \
+           MAKENSIS="wine C:/Program\ Files/NSIS/makensis.exe"; \
+       else \
+           echo 'Error: cannot locate makensis tool'; exit 1; \
+       fi; \
+       eval "$$MAKENSIS /DVERSION=${VERSION} $(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,6 +945,78 @@ package-win32: package-win32-base package-win32-base-exe package-win32-base-zip
 # Clean up
        rm -Rf $(top_builddir)/vlc-${VERSION}
 
+package-wince-base:
+# 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"; \
+         false; \
+       else \
+         echo "OK."; mkdir -p "$(top_builddir)/vlc-${VERSION}"; \
+       fi
+
+# Copy relevant files
+       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" > "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; \
+         unix2dos "$(top_builddir)/vlc-${VERSION}/$${file}.txt" ; done
+
+       mkdir $(top_builddir)/vlc-${VERSION}/locale
+       for i in $(ALL_LINGUAS); do \
+         mkdir -p "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES" ; \
+         cp "$(srcdir)/po/$${i}.gmo" \
+           "$(top_builddir)/vlc-${VERSION}/locale/$${i}/LC_MESSAGES/vlc.mo" \
+            || true ; \
+       done
+
+
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/images"
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/http/requests"
+       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/*.js $(top_builddir)/vlc-${VERSION}/http/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/http/*.js ;
+       cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-${VERSION}/http/ ;
+       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/vlc48x48.ico $(top_builddir)/vlc-${VERSION}/ ;
+
+if BUILD_MOZILLA
+       mkdir -p "$(top_builddir)/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
+
+if BUILD_ACTIVEX
+       mkdir -p "$(top_builddir)/vlc-${VERSION}/activex"
+       cp $(srcdir)/activex/README.TXT  $(top_builddir)/vlc-${VERSION}/activex/ ;
+       cp $(srcdir)/activex/test.html  $(top_builddir)/vlc-${VERSION}/activex/ ;
+       unix2dos $(top_builddir)/vlc-${VERSION}/activex/* ;
+
+       cp $(top_builddir)/activex/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/activex/ ;
+       $(STRIP) $(top_builddir)/vlc-${VERSION}/activex/*$(LIBEXT);
+endif
+# Rebase all those DLLs to speed up loading (need cygwin rebase)
+       if [ -x rebase ]; then \
+               find $(top_builddir)/vlc-${VERSION} -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
+       fi
+
+package-wince-base-zip:
+# Create package 
+       zip -r vlc-${VERSION}-wince.zip vlc-${VERSION}
+
+package-wince: package-wince-base  package-wince-base-zip
+# Clean up
+       rm -Rf $(top_builddir)/vlc-${VERSION}
+
+
 package-beos:
 # Check that tmp isn't in the way
        @if test -e $(srcdir)/tmp; then \
@@ -1020,7 +1063,7 @@ package-macosx:
 
 # 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/
+       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/
 
 # Create disk image 
        $(srcdir)/extras/MacOSX/macosx-dmg "vlc-${VERSION}" $(top_builddir)/tmp
@@ -1069,7 +1112,7 @@ update-po:
          echo "" ; \
          echo "# main sources" ; \
          find include src -name '*.[chm]' -o -name '*.[ch]pp' \
-           | grep -v '\(vlc_symbols\|misc/modules_\)' \
+           | grep -v '\(vlc_symbols\|misc/modules_\|src/misc/version.c\)' \
            | sort ; \
          echo "" ; \
          echo "# modules" ; \