* plugins/dsp/aout_dsp.c: Added O_NONBLOCK flag to the open command,

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index 80e1194110ed968e38716ce8e3ace93b4fcfa608..c93fcbf843c3963aa1ab1909232b29bfcb26e554 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,9 @@
 ifeq ($(shell [ ! -r Makefile.opts ] && echo 1),)
     include Makefile.opts
 endif
+ifeq ($(shell [ ! -r Makefile.config ] && echo 1),)
+    include Makefile.config
+endif
 
 ###############################################################################
 # Objects and files
@@ -30,6 +33,7 @@ PLUGINS_DIR :=        a52 \
                dvd \
                dvdread \
                esd \
+               familiar \
                fb \
                ffmpeg \
                filter \
@@ -52,8 +56,10 @@ PLUGINS_DIR :=       a52 \
                mpeg_vdec \
                network \
                ogg \
+               opie \
                qnx \
                qt \
+               qte \
                satellite \
                sdl \
                spudec \
@@ -68,6 +74,7 @@ PLUGINS_TARGETS := a52/a52 \
                ac3_spdif/ac3_spdif \
                access/file \
                access/udp \
+               access/rtp \
                access/http \
                alsa/alsa \
                arts/arts \
@@ -91,6 +98,7 @@ PLUGINS_TARGETS := a52/a52 \
                dvd/dvd \
                dvdread/dvdread \
                esd/esd \
+               familiar/familiar \
                fb/fb \
                ffmpeg/ffmpeg \
                filter/filter_deinterlace \
@@ -98,6 +106,8 @@ PLUGINS_TARGETS := a52/a52 \
                filter/filter_invert \
                filter/filter_distort \
                filter/filter_wall \
+               filter/filter_clone \
+               filter/filter_crop \
                fx/fx_scope \
                ggi/ggi \
                glide/glide \
@@ -138,8 +148,10 @@ PLUGINS_TARGETS := a52/a52 \
                network/ipv4 \
                network/ipv6 \
                ogg/vorbis \
+               opie/opie \
                qnx/qnx \
                qt/qt \
+               qte/qte \
                satellite/satellite \
                sdl/sdl \
                spudec/spudec \
@@ -191,7 +203,7 @@ C_OBJ +=    src/misc/win32_specific.o
 RESOURCE_OBJ :=        share/vlc_win32_rc.o
 endif
 
-VLC_OBJ := $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
+VLC_OBJ := $(C_OBJ) $(CPP_OBJ) $(M_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
 
 #
 # Generated header
@@ -277,7 +289,7 @@ vlc-clean:
 distclean: clean
        -cd po && $(MAKE) maintainer-clean
        rm -f **/*.o **/*~ *.log
-       rm -f Makefile.opts
+       rm -f Makefile.opts Makefile.config
        rm -f include/defs.h include/modules_builtin.h
        rm -f src/misc/modules_builtin.h
        rm -f config*status config*cache config*log conftest*
@@ -338,14 +350,14 @@ dist:
                echo "OK."; mkdir tmp; \
        fi
        # Copy directory structure in tmp
-       find -type d | grep -v '\(\.dep\|snapshot\|CVS\)' | while read i ; \
+       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
-       find include src plugins -type f -name '*.[bcdhigrst]*' | while read i ; \
+       # Copy .c .h .in .cpp .m and .glade files
+       find include src plugins -type f -name '*.[bcdhigmrst]*' | while read i ; \
                do cp $$i tmp/vlc/$$i ; done
        # Grmbl... special case...
        for i in API BUGS DESIGN TODO ; \
@@ -364,8 +376,8 @@ dist:
        for i in Makefile.in.in POTFILES.in ; do cp po/$$i tmp/vlc/po ; done
        # Copy misc files
        cp FAQ AUTHORS COPYING TODO todo.pl ChangeLog* README* INSTALL* \
-               ABOUT-NLS BUGS MODULES vlc.spec \
-               Makefile Makefile.opts.in Makefile.dep Makefile.modules \
+               ABOUT-NLS BUGS plugins/LIST vlc.spec \
+               Makefile Makefile.*.in Makefile.dep Makefile.modules \
                configure configure.in install-sh install-win32 macosx-dmg \
                config.sub config.guess aclocal.m4 mkinstalldirs \
                        tmp/vlc/
@@ -375,8 +387,8 @@ dist:
        for file in control changelog rules ; do \
                cp debian/$$file tmp/vlc/debian/ ; done
        # Copy ipkg control files
-       for file in control rules patch ; do \
-               cp ipkg/$$file tmp/vlc/ipkg/ ; done
+       for file in ipkg/* ; do \
+               cp $$file tmp/vlc/ipkg/ ; done
        # Copy fonts and icons
        for file in share/*vlc* share/*psf; do \
                cp $$file tmp/vlc/share ; done
@@ -433,6 +445,7 @@ package-beos:
        # Copy relevant files
        cp vlc tmp/vlc/
        strip tmp/vlc/vlc
+       xres -o tmp/vlc/vlc ./share/vlc_beos.rsrc
        cp AUTHORS COPYING ChangeLog README FAQ TODO tmp/vlc/
        for file in default8x16.psf default8x9.psf ; \
                do cp share/$$file tmp/vlc/share/ ; done
@@ -457,7 +470,7 @@ package-macosx:
 
        # Copy relevant files 
        cp -R vlc.app tmp/
-       cp AUTHORS COPYING ChangeLog README README\ -\ Mac\ OS\ X.rtf FAQ TODO tmp/
+       cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf FAQ TODO tmp/
 
        # Create disk image 
        ./macosx-dmg 0 "vlc-${VERSION}" tmp/* 
@@ -531,6 +544,12 @@ $(CPP_OBJ): %.o: .dep/%.dpp
 $(CPP_OBJ): %.o: %.cpp
        $(CC) $(CFLAGS) $(vlc_CFLAGS) -c -o $@ $<
 
+$(M_OBJ): %.o: Makefile.opts Makefile.dep Makefile
+$(M_OBJ): %.o: $(H_OBJ)
+$(M_OBJ): %.o: .dep/%.dm
+$(M_OBJ): %.o: %.m
+       $(CC) $(CFLAGS) $(vlc_CFLAGS) -c -o $@ $<
+
 $(RESOURCE_OBJ): %.o: Makefile.dep Makefile
 ifneq (,(findstring mingw32,$(SYS)))
 $(RESOURCE_OBJ): %.o: %.rc
@@ -540,7 +559,7 @@ endif
 #
 # Main application target
 #
-vlc: Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ)
+vlc: Makefile.config Makefile.opts Makefile.dep Makefile $(VLC_OBJ) $(BUILTIN_OBJ)
        $(CC) $(CFLAGS) -o $@ $(VLC_OBJ) $(BUILTIN_OBJ) $(LDFLAGS) $(vlc_LDFLAGS) $(builtins_LDFLAGS)
 ifeq ($(SYS),beos)
        xres -o $@ ./share/vlc_beos.rsrc