Qt: wrap items automatically in a grid.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 20c2576ae2d4ef19cdeee9c85433100da121638b..fff7f22f77342cf37cca62a5291541011c422eaf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -492,9 +492,9 @@ VLC-release.app: vlc
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
        $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
-        xcodebuild -target vlc $(silentstd) && \
+        xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
        cd ../../../../ && \
-       cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \
+       cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC-release.app; \
        rm -Rf $(top_builddir)/tmp
        $(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
        PRODUCT="VLC-release.app" ACTION="release-makefile" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
@@ -645,9 +645,9 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
              $(top_builddir)/tmp/modules/gui/macosx; \
        done
        $(AM_V_GEN)cd $(top_builddir)/tmp/extras/package/macosx && \
-       xcodebuild -target vlc $(silentstd) && \
+       xcodebuild -target vlc SYMROOT=../../../build $(silentstd) && \
        cd ../../../../ && \
-       cp -R $(top_builddir)/tmp/extras/package/macosx/build/Default/VLC.bundle $(top_builddir)/VLC.app
+       cp -R $(top_builddir)/tmp/build/Default/VLC.bundle $(top_builddir)/VLC.app
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
        touch $(top_builddir)/VLC.app/Contents/MacOS/VLC
        chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC
@@ -907,6 +907,7 @@ package-win-common-strip: package-win32-base-debug
          echo "OK."; mkdir -p "$(win32_debugdir)"; \
        fi
        for i in "" $(win32_destdir)/*$(LIBEXT) \
+                   $(win32_destdir)/*$(EXEEXT) \
                    $(win32_destdir)/activex/*$(LIBEXT) \
                    $(win32_destdir)/mozilla/*$(LIBEXT) \
                    $(win32_destdir)/plugins/*$(LIBEXT) \