* Added a missing call to DecoderError() in mpeg_adec.c.

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index 5d304367e7fd2c5cdf3d9ac013be6a375a8f1a89..69a996cfe2ca84a19639a13bbf29d63afd04ee00 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,11 +18,11 @@ PLUGINS_DIR :=      ac3_adec \
                alsa \
                arts \
                beos \
-               darwin \
                directx \
                dsp \
                dummy \
                dvd \
+               dvdread \
                esd \
                fb \
                ggi \
@@ -34,6 +34,8 @@ PLUGINS_DIR :=        ac3_adec \
                kde \
                lpcm_adec \
                macosx \
+               mad_adec \
+               memcpy \
                mga \
                motion \
                mpeg \
@@ -52,12 +54,12 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
                alsa/alsa \
                arts/arts \
                beos/beos \
-               darwin/darwin \
                directx/directx \
                dsp/dsp \
                dummy/dummy \
                dummy/null \
                dvd/dvd \
+               dvdread/dvdread \
                esd/esd \
                fb/fb \
                ggi/ggi \
@@ -78,7 +80,11 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
                kde/kde \
                lpcm_adec/lpcm_adec \
                macosx/macosx \
-               macosx/macosx_qt \
+               mad_adec/mad \
+               memcpy/memcpy \
+               memcpy/memcpymmx \
+               memcpy/memcpymmxext \
+               memcpy/memcpy3dn \
                mga/mga \
                motion/motion \
                motion/motionmmx \
@@ -104,7 +110,7 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
 # C Objects
 # 
 INTERFACE := main interface intf_msg intf_playlist intf_channels
-INPUT := input input_ext-dec input_ext-intf input_dec input_programs input_netlist input_clock mpeg_system
+INPUT := input input_ext-dec input_ext-intf input_dec input_programs input_clock mpeg_system
 VIDEO_OUTPUT := video_output video_text video_spu video_yuv
 AUDIO_OUTPUT := audio_output aout_ext-dec aout_u8 aout_s8 aout_u16 aout_s16 aout_spdif
 MISC := mtime tests modules netutils iso_lang
@@ -161,8 +167,8 @@ endif
 #
 # Misc variables
 #
-VLC_QUICKVERSION := $(shell grep '^ *VLC_VERSION=[0-9]' configure.in | head -1 | cut -f2 -d=)
-LIBDVDCSS_QUICKVERSION := $(shell grep '^ *LIBDVDCSS_VERSION=[0-9]' configure.in | head -1 | cut -f2 -d=)
+VLC_QUICKVERSION := $(shell grep '^ *VLC_VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=)
+LIBDVDCSS_QUICKVERSION := $(shell grep '^ *LIBDVDCSS_VERSION=' configure.in | head -1 | sed 's/"//g' | cut -f2 -d=)
 
 
 # All symbols must be exported
@@ -198,7 +204,7 @@ show:
 #
 # Cleaning rules
 #
-clean: libdvdcss-clean plugins-clean vlc-clean
+clean: libdvdcss-clean libdvdread-clean plugins-clean vlc-clean
        rm -f src/*/*.o extras/*/*.o
        rm -f lib/*.so* lib/*.a
        rm -f plugins/*.so plugins/*.a
@@ -207,6 +213,9 @@ clean: libdvdcss-clean plugins-clean vlc-clean
 libdvdcss-clean:
        -cd extras/libdvdcss && $(MAKE) clean
 
+libdvdread-clean:
+       -cd extras/libdvdread && $(MAKE) clean
+
 plugins-clean:
        for dir in $(PLUGINS_DIR) ; do \
                ( cd plugins/$${dir} && $(MAKE) clean ) ; done
@@ -363,12 +372,12 @@ package-win32:
        # Create installation script
        sed -e 's#@VERSION@#'${VLC_QUICKVERSION}'#' < install-win32 > tmp/nsi
        # Copy relevant files
-       cp vlc.exe plugins/directx.so plugins/gtk.so plugins/sdl.so tmp/ 
+       cp vlc.exe $(PLUGINS:%=plugins/%.so) tmp/ 
        cp INSTALL-win32.txt AUTHORS COPYING ChangeLog ChangeLog.libdvdcss \
                README README.libdvdcss FAQ TODO tmp/
        for file in gtk-1.3.dll gdk-1.3.dll glib-1.3.dll gmodule-1.3.dll \
                gnu-intl.dll SDL.dll README-SDL.txt ; \
-                       do cp ../win32-libs/$$file tmp/ ; done
+                       do cp ${DLL_PATH}/$$file tmp/ ; done
        mkdir tmp/share
        for file in default8x16.psf default8x9.psf ; \
                do cp share/$$file tmp/share/ ; done
@@ -451,8 +460,8 @@ ifneq (,$(findstring darwin,$(SYS)))
        rm -Rf vlc.app
        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) -d vlc.app/Contents/MacOS/share
+       $(INSTALL) -d vlc.app/Contents/MacOS/plugins
        $(INSTALL) vlc vlc.app/Contents/MacOS/
 ifneq (,$(PLUGINS))
        $(INSTALL) $(PLUGINS:%=plugins/%.so) vlc.app/Contents/MacOS/plugins
@@ -491,12 +500,12 @@ endif
 $(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile
 $(C_OBJ): %.o: .dep/%.d
 $(C_OBJ): %.o: %.c
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $<
 
 $(CPP_OBJ): %.o: Makefile.opts Makefile.dep Makefile
 $(CPP_OBJ): %.o: .dep/%.dpp
 $(CPP_OBJ): %.o: %.cpp
-       $(CC) $(CFLAGS) -c -o $@ $<
+       $(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $<
 
 $(RESOURCE_OBJ): %.o: Makefile.dep Makefile
 ifneq (,(findstring mingw32,$(SYS)))
@@ -533,3 +542,10 @@ $(BUILTIN_OBJ): FORCE
 #
 libdvdcss: Makefile.opts
        cd extras/libdvdcss && $(MAKE)
+
+#
+# libdvdread target
+#
+libdvdread: Makefile.opts
+       cd extras/libdvdread && $(MAKE)
+