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

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index fbac4a235aafa919b9c61e75b915e633fbdc5497..69a996cfe2ca84a19639a13bbf29d63afd04ee00 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -34,6 +34,7 @@ PLUGINS_DIR :=        ac3_adec \
                kde \
                lpcm_adec \
                macosx \
+               mad_adec \
                memcpy \
                mga \
                motion \
@@ -79,6 +80,7 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
                kde/kde \
                lpcm_adec/lpcm_adec \
                macosx/macosx \
+               mad_adec/mad \
                memcpy/memcpy \
                memcpy/memcpymmx \
                memcpy/memcpymmxext \
@@ -108,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
@@ -165,8 +167,8 @@ endif
 #
 # Misc variables
 #
-VLC_QUICKVERSION := $(shell grep '^ *VLC_VERSION=' configure.in | head -1 | cut -f2 -d=)
-LIBDVDCSS_QUICKVERSION := $(shell grep '^ *LIBDVDCSS_VERSION=' 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
@@ -370,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
@@ -498,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)))