- Do not resample if delta is short enough

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index 0e2164a03affa8a92bc417d4bf86353416f9bbe8..10e0ea8fb2313e1767a906e32cb7c4ab64c84c76 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -13,12 +13,12 @@ endif
 # 
 # All possible plugin directories, needed for make clean
 #
-PLUGINS_DIR := alsa beos darwin directx dsp dummy dvd esd fb ggi glide gtk downmix idct imdct kde macosx mga motion mpeg qt sdl text x11 yuv
+PLUGINS_DIR := alsa beos darwin directx dsp dummy dvd esd fb ggi glide gtk downmix idct imdct kde macosx mga motion mpeg qt sdl text vcd x11 yuv
 
 #
 # All possible plugin objects
 #
-PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin directx/directx dsp/dsp dummy/dummy dummy/null dvd/dvd esd/esd fb/fb ggi/ggi glide/glide gtk/gnome gtk/gtk downmix/downmix downmix/downmixsse downmix/downmix3dn idct/idct idct/idctclassic idct/idctmmx idct/idctmmxext imdct/imdct imdct/imdct3dn imdct/imdctsse kde/kde macosx/macosx mga/mga motion/motion motion/motionmmx motion/motionmmxext mpeg/es mpeg/ps mpeg/ts qt/qt sdl/sdl text/ncurses text/rc x11/x11 x11/xvideo yuv/yuv yuv/yuvmmx
+PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin directx/directx dsp/dsp dummy/dummy dummy/null dvd/dvd esd/esd fb/fb ggi/ggi glide/glide gtk/gnome gtk/gtk downmix/downmix downmix/downmixsse downmix/downmix3dn idct/idct idct/idctclassic idct/idctmmx idct/idctmmxext idct/idctaltivec imdct/imdct imdct/imdct3dn imdct/imdctsse kde/kde macosx/macosx macosx/macosx_qt mga/mga motion/motion motion/motionmmx motion/motionmmxext motion/motion3dnow motion/motionaltivec mpeg/es mpeg/ps mpeg/ts qt/qt sdl/sdl text/ncurses text/rc vcd/vcd x11/x11 x11/xvideo yuv/yuv yuv/yuvmmx
 
 #
 # C Objects
@@ -66,6 +66,8 @@ ifneq (,$(findstring mingw32,$(SYS)))
 RESOURCE_OBJ :=        share/vlc_win32_rc.o
 endif
 
+VLC_OBJ := $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
+
 #
 # Generated header
 #
@@ -131,6 +133,7 @@ clean: libdvdcss-clean plugins-clean vlc-clean
        rm -f src/*/*.o extras/*/*.o
        rm -f lib/*.so* lib/*.a
        rm -f plugins/*.so plugins/*.a
+       rm -rf extras/MacOSX/build
 
 libdvdcss-clean:
        -cd extras/libdvdcss && $(MAKE) clean
@@ -174,7 +177,7 @@ endif
        $(INSTALL) -m 644 share/*.xpm $(DESTDIR)$(datadir)/videolan
 
 vlc-uninstall:
-       rm vlc $(DESTDIR)$(bindir)/vlc
+       rm -f $(DESTDIR)$(bindir)/vlc
 ifneq (,$(ALIASES))
        for alias in $(ALIASES) ; do if test $$alias ; then rm -f $(DESTDIR)$(bindir)/$$alias ; fi ; done
 endif
@@ -211,6 +214,7 @@ snapshot-common:
        find -type d | grep -v '\(\.dep\|snapshot\|CVS\)' | while read i ; \
                do mkdir -p tmp/vlc/$$i ; \
        done
+       rm -Rf tmp/vlc/tmp
        find debian -mindepth 1 -maxdepth 1 -type d | \
                while read i ; do rm -Rf tmp/vlc/$$i ; done
        # Copy .c .h .in .cpp and .glade files
@@ -226,7 +230,7 @@ snapshot-common:
                -type d -name CVS -o -name '.*' -o -name '*.[o]' | \
                        while read i ; do rm -Rf $$i ; done
        # Copy misc files
-       cp vlc.spec AUTHORS COPYING TODO todo.pl ChangeLog README* INSTALL* \
+       cp vlc.spec AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \
                Makefile Makefile.opts.in Makefile.dep Makefile.modules \
                configure configure.in install-sh config.sub config.guess \
                        tmp/vlc/
@@ -276,7 +280,7 @@ snapshot-nocss: snapshot-common
 libdvdcss-snapshot: snapshot-common
        # Remove vlc sources and icons, doc, debian directory...
        rm -Rf tmp/vlc/src tmp/vlc/share tmp/vlc/plugins tmp/vlc/doc
-       rm -Rf tmp/vlc/extras/GNUgetopt tmp/vlc/extras/MacOSX_app
+       rm -Rf tmp/vlc/extras/GNUgetopt tmp/vlc/extras/MacOSX
        rm -Rf tmp/vlc/debian
        # Remove useless headers
        rm -f tmp/vlc/include/*
@@ -286,6 +290,7 @@ libdvdcss-snapshot: snapshot-common
        rm -f tmp/vlc/vlc.spec tmp/vlc/INSTALL-win32.txt
        mv tmp/vlc/INSTALL.libdvdcss tmp/vlc/INSTALL
        mv tmp/vlc/README.libdvdcss tmp/vlc/README
+       mv tmp/vlc/ChangeLog.libdvdcss tmp/vlc/ChangeLog
        # Fix Makefile
        rm -f tmp/vlc/Makefile
        sed -e 's#^install:#install-unused:#' \
@@ -317,13 +322,11 @@ gnome-vlc gvlc kvlc qvlc: vlc
 vlc.app: Makefile.opts
 ifneq (,$(findstring darwin,$(SYS)))
        rm -Rf vlc.app
-       mkdir -p vlc.app/Contents/Resources
-       mkdir -p vlc.app/Contents/MacOS/lib
-       mkdir -p vlc.app/Contents/MacOS/share
-       $(INSTALL) -m 644 extras/MacOSX_app/Contents/Info.plist vlc.app/Contents/
-       $(INSTALL) -m 644 extras/MacOSX_app/Contents/PkgInfo vlc.app/Contents/
+       cd extras/MacOSX ; pbxbuild | grep -v '^ ' | grep -v '^\t'
+       cp -r extras/MacOSX/build/vlc.bundle ./vlc.app
+       $(INSTALL) -d vlc vlc.app/Contents/MacOS/share
+       $(INSTALL) -d vlc vlc.app/Contents/MacOS/plugins
        $(INSTALL) vlc vlc.app/Contents/MacOS/
-       $(INSTALL) share/vlc.icns vlc.app/Contents/Resources/
 ifneq (,$(PLUGINS))
        $(INSTALL) $(PLUGINS:%=plugins/%.so) vlc.app/Contents/MacOS/plugins
 endif
@@ -377,8 +380,8 @@ endif
 #
 # Main application target
 #
-vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) plugins
-       $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ) $(LCFLAGS)
+vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(VLC_OBJ) $(BUILTIN_OBJ) plugins
+       $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LCFLAGS)
 ifeq ($(SYS),beos)
        xres -o $@ ./share/vlc_beos.rsrc
        mimeset -f $@