* src/input/input.c: fixed nasty bug with preparsing where a mutex was used uninitial...

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 10159624a82c8c5b13d291ec1c4a453819578990..e676c3b89e6410abc44486c8e6eb010e513f83b1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -9,7 +9,7 @@ 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/bindings because the plugin needs libvlc_pic.a
+#  - . should come before mozilla/bindings because the plugin needs libvlc.a
 #  - po should come before . because VLC.app needs the pofiles
 #  - loader should come before modules because some plugins need it
 SUBDIRS = intl loader src modules po . mozilla bindings activex share m4 doc
@@ -47,10 +47,6 @@ endif
 # Tell aclocal to use -I m4. Wonder if it really works.
 ACLOCAL_AMFLAGS = -I m4
 
-# XXX: these flags could be set in configure.ac, but we set them here
-# because old versions of automake don't support them in configure.ac.
-AUTOMAKE_OPTIONS = dist-bzip2
-
 ###############################################################################
 # MacOS X project
 ###############################################################################
@@ -86,6 +82,9 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/English.lproj/Interaction.nib/classes.nib \
        extras/MacOSX/Resources/English.lproj/Interaction.nib/info.nib \
        extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib \
+       extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib \
+       extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/info.nib \
+       extras/MacOSX/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib \
        extras/MacOSX/Resources/English.lproj/InfoPlist.strings \
        extras/MacOSX/Resources/a52.icns \
        extras/MacOSX/Resources/aac.icns \
@@ -156,6 +155,13 @@ EXTRA_DIST += \
        extras/MacOSX/Resources/vlc.scriptSuite \
        extras/MacOSX/Resources/vlc.scriptTerminology \
        extras/MacOSX/Resources/README \
+       extras/MacOSX/Resources/add_embedded.png \
+       extras/MacOSX/Resources/add_embedded_blue.png \
+       extras/MacOSX/Resources/repeat_embedded.png \
+       extras/MacOSX/Resources/repeat_embedded_blue.png \
+       extras/MacOSX/Resources/repeat_single_embedded_blue.png \
+       extras/MacOSX/Resources/shuffle_embedded.png \
+       extras/MacOSX/Resources/shuffle_embedded_blue.png \
        extras/MacOSX/vlc.pbproj/project.pbxproj \
        extras/MacOSX/Delete_Preferences.app/Contents/Info.plist \
        extras/MacOSX/Delete_Preferences.app/Contents/PkgInfo \
@@ -181,6 +187,7 @@ EXTRA_DIST += \
        extras/vlc.vim \
        extras/make.pl \
        extras/valgrind.suppressions \
+       extras/m4/autoconf260.m4 \
        $(NULL)
 
 ###############################################################################
@@ -215,9 +222,11 @@ bin_SCRIPTS = vlc-config
 vlc-config: $(top_builddir)/config.status $(top_builddir)/vlc-config.in
        $(SHELL) ./config.status --file=$@
        chmod 0755 $@
+       touch $@
 
 vlc-config.in: vlc-config.in.in
        ./config.status --recheck
+       touch $@
 
 CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
 DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
@@ -245,7 +254,7 @@ vlc_LDADD = $(DATA_win32_rc) $(LIBVLC)
 
 vlc_CFLAGS = `$(VLC_CONFIG) --cflags vlc`
 if USE_LIBTOOL
-vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc`
+vlc_LDFLAGS = `$(VLC_CONFIG) --libs vlc` -version-info 0:0:0
 LIB_libvlc = libvlc.la
 LIBVLC = src/$(LIB_libvlc)
 else
@@ -680,7 +689,6 @@ endif
 if BUILD_MOZILLA
        mkdir -p "$(top_builddir)/vlc-${VERSION}/mozilla"
        cp $(top_builddir)/mozilla/*$(LIBEXT) $(top_builddir)/vlc-${VERSION}/mozilla/ ;
-       cp $(top_builddir)/mozilla/vlcintf.xpt  $(top_builddir)/vlc-${VERSION}/mozilla/ ;
 endif
 
 if BUILD_ACTIVEX
@@ -933,8 +941,9 @@ update-po:
            | sort ; \
          echo "" ; \
          echo "# modules" ; \
-         find modules -name '*.[chm]' -o -name '*.[ch]pp' \
+         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 \
            | sort ; \
        } > $(top_srcdir)/po/POTFILES.in
        rm -f $(top_srcdir)/po/vlc.pot