Fixed a typo in aspect ratio calculation

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index 115692aad2e37823c16e31eac691976db1e68b7a..bd0f6d894972008bc3c4fe40184b24dfc61fab43 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,7 @@ PLUGINS_DIR :=        ac3_adec \
                beos \
                chroma \
                directx \
+               downmix \
                dsp \
                dummy \
                dvd \
@@ -30,10 +31,11 @@ PLUGINS_DIR :=      ac3_adec \
                ggi \
                glide \
                gtk \
-               downmix \
                idct \
                imdct \
                kde \
+               a52 \
+               lirc \
                lpcm_adec \
                macosx \
                mad \
@@ -48,6 +50,7 @@ PLUGINS_DIR :=        ac3_adec \
                spudec \
                text \
                vcd \
+               win32 \
                x11
 
 PLUGINS_TARGETS := ac3_adec/ac3_adec \
@@ -55,9 +58,18 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
                alsa/alsa \
                arts/arts \
                beos/beos \
-               chroma/chroma_yv12_rgb8 \
-               chroma/chroma_yv12_rgb16 \
+               chroma/chroma_i420_rgb \
+               chroma/chroma_i420_rgb_mmx \
+               chroma/chroma_i420_yuy2 \
+               chroma/chroma_i420_yuy2_mmx \
+               chroma/chroma_i422_yuy2 \
+               chroma/chroma_i422_yuy2_mmx \
+               chroma/chroma_i420_ymga \
+               chroma/chroma_i420_ymga_mmx \
                directx/directx \
+               downmix/downmix \
+               downmix/downmixsse \
+               downmix/downmix3dn \
                dsp/dsp \
                dummy/dummy \
                dummy/null \
@@ -74,9 +86,6 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
                glide/glide \
                gtk/gnome \
                gtk/gtk \
-               downmix/downmix \
-               downmix/downmixsse \
-               downmix/downmix3dn \
                idct/idct \
                idct/idctclassic \
                idct/idctmmx \
@@ -86,6 +95,8 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
                imdct/imdct3dn \
                imdct/imdctsse \
                kde/kde \
+               a52/a52 \
+               lirc/lirc \
                lpcm_adec/lpcm_adec \
                macosx/macosx \
                mad/mad \
@@ -94,6 +105,7 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
                memcpy/memcpymmxext \
                memcpy/memcpy3dn \
                mga/mga \
+               mga/xmga \
                motion/motion \
                motion/motionmmx \
                motion/motionmmxext \
@@ -110,18 +122,18 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
                text/ncurses \
                text/rc \
                vcd/vcd \
+               win32/waveout \
+               win32/win32 \
                x11/x11 \
-               x11/xvideo \
-               yuv/yuv \
-               yuv/yuvmmx
+               x11/xvideo
 
 #
 # C Objects
 # 
-INTERFACE := main interface intf_msg intf_playlist
+INTERFACE := main interface intf_msg intf_playlist intf_eject
 INPUT := input input_ext-dec input_ext-intf input_dec input_programs input_clock mpeg_system
 VIDEO_OUTPUT := video_output video_text vout_pictures vout_subpictures
-AUDIO_OUTPUT := audio_output aout_ext-dec aout_u8 aout_s8 aout_u16 aout_s16 aout_spdif
+AUDIO_OUTPUT := audio_output aout_common aout_ext-dec aout_spdif
 MISC := mtime modules netutils iso_lang
 
 C_OBJ :=       $(INTERFACE:%=src/interface/%.o) \
@@ -137,6 +149,10 @@ ifeq ($(NEED_GETOPT),1)
 C_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o 
 endif
 
+ifeq ($(NEED_SYMBOLS),1)
+C_OBJ += src/misc/symbols.o
+endif
+
 ifeq ($(SYS),beos)
 CPP_OBJ :=     src/misc/beos_specific.o
 endif
@@ -244,7 +260,7 @@ distclean: clean
        -cd po && $(MAKE) maintainer-clean
        rm -f **/*.o **/*~ *.log
        rm -f Makefile.opts
-       rm -f include/defs.h include/config.h include/modules_builtin.h
+       rm -f include/defs.h include/modules_builtin.h
        rm -f src/misc/modules_builtin.h
        rm -f config*status config*cache config*log
        rm -f gmon.out core build-stamp
@@ -293,6 +309,12 @@ libdvdcss-install:
 libdvdcss-uninstall:
        -cd extras/libdvdcss && $(MAKE) uninstall
 
+libdvdread-install:
+       -cd extras/libdvdread && $(MAKE) install
+
+libdvdread-uninstall:
+       -cd extras/libdvdread && $(MAKE) uninstall
+
 po-install:
        -cd po && $(MAKE) install
 
@@ -432,7 +454,26 @@ package-beos:
        mv tmp/vlc tmp/vlc-${VLC_QUICKVERSION}
        (cd tmp ; find vlc-${VLC_QUICKVERSION} | \
        zip -9 -@ vlc-${VLC_QUICKVERSION}-beos.zip )
-       mv tmp/vlc-${VLC_QUICKVERSION}-beos.zip .
+       mv tmp/vlc-${VLC_QUICKVERSION}-BeOS-x86.zip .
+       # Clean up
+       rm -Rf tmp
+
+package-macosx:
+       # Check that tmp isn't in the way
+       @if test -e tmp; then \
+               echo "Error: please remove ./tmp, it is in the way"; false; \
+       else \
+               echo "OK."; mkdir tmp; \
+       fi
+
+       # Copy relevant files 
+       cp -R vlc.app tmp/
+       cp AUTHORS COPYING ChangeLog ChangeLog.libdvdcss \
+               README README.libdvdcss FAQ TODO tmp/
+
+       # Create disk image 
+       ./macosx-dmg 0 "vlc-${VLC_QUICKVERSION}" tmp/* 
+
        # Clean up
        rm -Rf tmp
 
@@ -444,7 +485,7 @@ libdvdcss-snapshot: snapshot-common
        rm -Rf tmp/vlc/ipkg
        # Remove useless headers
        rm -f tmp/vlc/include/*
-       for file in defs.h.in config.h.in common.h int_types.h ; \
+       for file in defs.h.in config.h common.h int_types.h ; \
                do cp include/$$file tmp/vlc/include/ ; done
        # Remove misc files (??? - maybe not really needed)
        rm -f tmp/vlc/vlc.spec tmp/vlc/INSTALL-win32.txt
@@ -516,9 +557,9 @@ ifneq (,$(BUILTINS))
        @for i in $(BUILTINS) ; do \
                echo "        ALLOCATE_BUILTIN("$$i"); \\" >> $@ ; \
        done
+endif
        @echo "    } while( 0 );" >> $@ ;
        @echo "" >> $@ ;
-endif
 
 $(C_DEP): %.d: FORCE
        @$(MAKE) -s --no-print-directory -f Makefile.dep $@
@@ -526,12 +567,14 @@ $(C_DEP): %.d: FORCE
 $(CPP_DEP): %.dpp: FORCE
        @$(MAKE) -s --no-print-directory -f Makefile.dep $@
 
-$(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile $(H_OBJ)
+$(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile
+$(C_OBJ): %.o: $(H_OBJ)
 $(C_OBJ): %.o: .dep/%.d
 $(C_OBJ): %.o: %.c
        $(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $<
 
 $(CPP_OBJ): %.o: Makefile.opts Makefile.dep Makefile
+$(CPP_OBJ): %.o: $(H_OBJ)
 $(CPP_OBJ): %.o: .dep/%.dpp
 $(CPP_OBJ): %.o: %.cpp
        $(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $<