That should fix building the python bindings if srcdir =! builddir.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b096ac0c8d4488c54071147b924fa5a945562f2a..e676c3b89e6410abc44486c8e6eb010e513f83b1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -155,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 \
@@ -180,6 +187,7 @@ EXTRA_DIST += \
        extras/vlc.vim \
        extras/make.pl \
        extras/valgrind.suppressions \
+       extras/m4/autoconf260.m4 \
        $(NULL)
 
 ###############################################################################
@@ -246,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
@@ -681,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
@@ -934,7 +941,7 @@ update-po:
            | sort ; \
          echo "" ; \
          echo "# modules" ; \
-         find modules -name '*.[chm]' -o -name '*.[ch]pp' -o -name 'qt4/ui/*.ui'\
+         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 ; \