Put a test outside a loop : fixes task 0x31

[vlc] / Makefile.in

diff --git a/Makefile.in b/Makefile.in
index 359568864b59b42795a806b106b9bbae7c4fca57..403ebf4fb81d18ed8c0699c1a121944ced75b4e6 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -29,7 +29,7 @@ prefix=@prefix@
 PROGRAM_OPTIONS = $(SYS) $(ARCH)
 ifeq ($(DEBUG),1)
 PROGRAM_OPTIONS += DEBUG
-DEFINE += -DDEBUG
+DEFINE += -DDEBUG -g
 endif
 
 # PROGRAM_BUILD is a complete identification of the build
@@ -293,7 +293,10 @@ PLUGIN_GGI    = plugins/ggi/ggi.o \
 
 PLUGIN_SDL    = plugins/sdl/sdl.o \
                plugins/sdl/intf_sdl.o \
-               plugins/sdl/vout_sdl.o
+               plugins/sdl/vout_sdl.o 
+#              plugins/sdl/video_yuv.o \
+#              plugins/sdl/video_yuvall.o
+
 
 PLUGIN_GLIDE  = plugins/glide/glide.o \
                plugins/glide/intf_glide.o \
@@ -322,6 +325,7 @@ PLUGIN_YUV    = plugins/yuv/yuv.o \
                plugins/yuv/video_yuv24.o \
                plugins/yuv/video_yuv32.o
 
+
 PLUGIN_YUVMMX = plugins/yuvmmx/yuvmmx.o \
                plugins/yuvmmx/video_yuv.o \
                plugins/yuvmmx/video_yuv8.o \
@@ -365,13 +369,14 @@ distclean: clean
        rm -f config.status config.cache config.log
        rm -f gmon.out core build-stamp
        rm -rf .dep
-       rm -rf debian/tmp debian/*.debhelper debian/*.substvars
+       rm -rf debian/tmp debian/files debian/*.debhelper debian/*.substvars
        find debian/* -type d -maxdepth 0 -name 'vlc-*' | xargs rm -rf
 
 install:
        mkdir -p $(prefix)/bin
        $(INSTALL) vlc $(prefix)/bin
-       for alias in @ALIASES@ ; do ln -s vlc $(prefix)/bin/$$alias ; done
+       # ugly
+       for alias in "" @ALIASES@ ; do if test $$alias ; then ln -s vlc $(prefix)/bin/$$alias ; fi ; done
        mkdir -p $(prefix)/lib/videolan/vlc
        $(INSTALL) -m 644 $(PLUGINS) $(prefix)/lib/videolan/vlc
        mkdir -p $(prefix)/share/videolan
@@ -388,7 +393,7 @@ show:
 snapshot:
        rm -rf /tmp/${SNAPSHOTDIR}
        mkdir /tmp/${SNAPSHOTDIR}
-       cp -r * /tmp/${SNAPSHOTDIR}
+       cp -a * /tmp/${SNAPSHOTDIR}
                (cd /tmp/${SNAPSHOTDIR} ; \
                make distclean ; \
                find . -type d -name CVS | xargs rm -rf ; \
@@ -512,7 +517,7 @@ else
        ld -shared -o $@ $^
 endif
 $(PLUGIN_YUV): %.o: %.c
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CCFLAGS) $(CFLAGS) -c -o $@ $<
 
 lib/yuvmmx.so: $(PLUGIN_YUVMMX)
 ifeq ($(SYS),beos)