Fix a memleak.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 085a279854e00bb49b013568b7499337ecbd45fd..97fbfd87d01660bd811b293a0deec04c25d2f5fa 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -104,9 +104,6 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/English.lproj/Extended.nib/classes.nib \
        extras/package/macosx/Resources/English.lproj/Extended.nib/info.nib \
        extras/package/macosx/Resources/English.lproj/Extended.nib/keyedobjects.nib \
-       extras/package/macosx/Resources/English.lproj/SFilters.nib/classes.nib \
-       extras/package/macosx/Resources/English.lproj/SFilters.nib/info.nib \
-       extras/package/macosx/Resources/English.lproj/SFilters.nib/keyedobjects.nib \
        extras/package/macosx/Resources/English.lproj/Update.nib/classes.nib \
        extras/package/macosx/Resources/English.lproj/Update.nib/info.nib \
        extras/package/macosx/Resources/English.lproj/Update.nib/keyedobjects.nib \
@@ -450,8 +447,6 @@ VLC-release.app: vlc
            extended.m \
            bookmarks.h \
            bookmarks.m \
-           sfilters.h \
-           sfilters.m \
            update.h \
            update.m \
            interaction.h \
@@ -610,8 +605,6 @@ VLC.app: vlc
            extended.m \
            bookmarks.h \
            bookmarks.m \
-           sfilters.h \
-           sfilters.m \
            update.h \
            update.m \
            interaction.h \
@@ -844,6 +837,16 @@ if BUILD_OSDMENU
        done
 endif
 
+# SDK
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/sdk.tmp"
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/sdk"
+       d=$$(pwd) && \
+       cd src && \
+       make install DESTDIR="$$d/vlc-$(VERSION)/sdk.tmp"
+       cd vlc-$(VERSION) && mv sdk.tmp/$(prefix)/* sdk/
+       find vlc-$(VERSION)/sdk.tmp -type d | sort -r | xargs rmdir
+       rm -Rf vlc-$(VERSION)/sdk/bin
+
 package-win-common-strip: package-win32-base-debug
        $(STRIP) "vlc-$(VERSION)/vlc$(EXEEXT)"
        $(STRIP) "vlc-$(VERSION)/libvlccore$(LIBEXT)"
@@ -864,7 +867,7 @@ package-win32-base-exe: package-win32-base
        if makensis -VERSION >/dev/null 2>&1; then \
            MAKENSIS="makensis"; \
        elif [ -x "/cygdrive/c/Program Files/NSIS/makensis" ]; then \
-           MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis)"; \
+           MAKENSIS="/cygdrive/c/Program\ Files/NSIS/makensis"; \
        elif [ -x "$(PROGRAMFILES)/NSIS/makensis" ]; then \
            MAKENSIS="$(PROGRAMFILES)/NSIS/makensis"; \
        elif wine --version >/dev/null 2>&1; then \
@@ -1130,7 +1133,13 @@ update-po:
            | grep -vE 'qt4/ui/.*.h' \
            | grep -v 'qt4/resources.cpp\|qt4/dialogs/about.hpp' \
            | grep -v 'gui/opie' \
+           | grep -v 'wxwidgets' \
+           | grep -v 'mux/rtp/' \
+           | grep -v 'demux/rtpxiph.c' \
            | sort ; \
+         echo "#bindings" ; \
+            find bindings -name '*.[chm]' -o -name '*.[ch]pp' \
+            |sort ; \
        } > $(top_srcdir)/po/POTFILES.in
        rm -f $(top_srcdir)/po/vlc.pot
        cd po && $(MAKE) POTFILES vlc.pot update-po