* skins2/controls/ctrl_generic.hpp: removed a useless include

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index a1432eae03b6c4946c81cdae3320b8efefd4ea03..c50cc1608d99dd080980981237ee0e2d05b3bdad 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,7 @@ DIST_SUBDIRS = $(SUBDIRS) debian ipkg lib
 EXTRA_DIST = \
        HACKING \
        INSTALL.win32 \
+       INSTALL.wince \
        vlc.exe.manifest \
        MAINTAINERS \
        README.MacOSX.rtf \
@@ -180,9 +181,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/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/InfoPlist.strings \
        extras/MacOSX/Resources/a52.icns \
        extras/MacOSX/Resources/aac.icns \
@@ -565,7 +566,7 @@ 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
@@ -608,8 +609,6 @@ VLC-release.app: vlc
            extended.m \
            bookmarks.h \
            bookmarks.m \
-           update.h \
-           update.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -617,15 +616,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
@@ -681,7 +680,7 @@ 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
@@ -724,8 +723,6 @@ VLC.app: vlc
            extended.m \
            bookmarks.h \
            bookmarks.m \
-           update.h \
-           update.m \
            vout.m; do \
          cp "$(srcdir)/modules/gui/macosx/$$i" \
              $(top_builddir)/tmp/modules/gui/macosx; \
@@ -733,15 +730,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
@@ -1068,7 +1065,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