Fixed numerous bugs with the Altivec IDCT (still not compiling).

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index 68ea8378226045751ad0db5938ebb41672917eaa..336b9b1328f604e0186c43c7b6b1b88c97aa117a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ PLUGINS_DIR :=        alsa beos darwin directx dsp dummy dvd esd fb ggi glide gtk downm
 #
 # 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 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 x11/x11 x11/xvideo yuv/yuv yuv/yuvmmx
 
 #
 # C Objects
@@ -50,7 +50,7 @@ C_OBJ :=      $(INTERFACE:%=src/interface/%.o) \
 #
 # Misc Objects
 # 
-ifeq ($(GETOPT),1)
+ifeq ($(NEED_GETOPT),1)
 C_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o 
 endif
 
@@ -211,6 +211,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 +227,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/
@@ -286,6 +287,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:#' \