Fix win32 compilation, but that will crash at run-time

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index aad90ecab33dbc93d7280bd85f647639fb3faef7..070d80b89aa6d310e5dc0324cb26e93506661bd7 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -258,6 +258,10 @@ vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 LIB_libvlc = libvlc.la
 LIBVLC = src/$(LIB_libvlc)
 
+#To get some nice output
+nice:
+               $(top_builddir)/compile
+
 # Shortcut for developpers to rebuild the core (libvlc + vlc)
 # Don't use it if you don't know what it is about.
 # Don't complain if it doesn't work. -- Courmisch
@@ -403,6 +407,11 @@ VLC-release.app: vlc
                   $(top_builddir)/VLC-release.app/Contents/MacOS/VLC
        $(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
                   $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc.dylib
+       $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.0.dylib \
+                  $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib
+       install_name_tool -change /usr/local/lib/libvlc.1.dylib \
+                  @executable_path/lib/libvlc.dylib \
+                  $(top_builddir)/VLC-release.app/Contents/MacOS/lib/libvlc-control.dylib
        install_name_tool -change /usr/local/lib/libvlc.1.dylib \
                   @executable_path/lib/libvlc.dylib \
               $(top_builddir)/VLC-release.app/Contents/MacOS/VLC
@@ -549,6 +558,11 @@ VLC.app: vlc
                   $(top_builddir)/VLC.app/Contents/MacOS/VLC
        $(INSTALL) $(top_builddir)/src/.libs/libvlc.1.dylib \
                   $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc.dylib
+       $(INSTALL) $(top_builddir)/src/.libs/libvlc-control.0.dylib \
+                  $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib
+       install_name_tool -change /usr/local/lib/libvlc.1.dylib \
+                  @executable_path/lib/libvlc.dylib \
+                  $(top_builddir)/VLC.app/Contents/MacOS/lib/libvlc-control.dylib
        install_name_tool -change /usr/local/lib/libvlc.1.dylib \
                   @executable_path/lib/libvlc.dylib \
               $(top_builddir)/VLC.app/Contents/MacOS/VLC
@@ -725,7 +739,7 @@ package-win32-base-debug: package-win-common
 
        mkdir -p "$(top_builddir)/vlc-${VERSION}/osdmenu"
        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 \
+       for dir in dvd dvd/selected dvd/unselect dvd/selection dvd/volume default default/selected default/selection default/volume minimal;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; \
@@ -982,6 +996,8 @@ package-translations:
 
 ###############################################################################
 # PO translation files update
+# Generate po/POTFILES.in which lists all the files containing translatable
+# strings. Find all source files and remove the generated files
 ###############################################################################
 .PHONY: update-po
 
@@ -999,7 +1015,7 @@ update-po:
          echo "# modules" ; \
          find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -wholename 'modules/gui/qt4/ui/*.ui'\
            | grep -v '\(\.moc\.\|gui/gtk2/\)' \
-           | grep -vE 'qt4/ui/.*.h' |grep -v qt4/resources.cpp \
+           | grep -vE 'qt4/ui/.*.h' |grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
            | sort ; \
        } > $(top_srcdir)/po/POTFILES.in
        rm -f $(top_srcdir)/po/vlc.pot