* Fixed the BeOS compile typo.

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index 9a868def9f85e9168151c708e66ddd6a74b46ad2..85a3ea3ce009e8ac7a10e40b4f4f5a4439941142 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 # All possible plugin directories, needed for make clean
 #
 PLUGINS_DIR := alsa beos darwin dsp dummy \
-               dvd esd fb ggi glide gnome gtk \
+               dvd esd fb ggi glide gtk \
                downmix idct imdct \
                macosx mga \
                motion \
@@ -23,10 +23,10 @@ PLUGINS_DIR :=      alsa beos darwin dsp dummy \
 # All possible plugin objects
 #
 PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin dsp/dsp dummy/dummy \
-               dvd/dvd esd/esd fb/fb ggi/ggi glide/glide gnome/gnome gtk/gtk \
+               dvd/dvd esd/esd fb/fb ggi/ggi glide/glide gtk/gnome gtk/gtk \
                downmix/downmix downmix/downmixsse downmix/downmix3dn \
                idct/idct idct/idctclassic idct/idctmmx idct/idctmmxext \
-               imdct/imdct imdct/imdctsse \
+               imdct/imdct imdct/imdct3dn imdct/imdctsse \
                macosx/macosx mga/mga \
                motion/motion motion/motionmmx motion/motionmmxext \
                mpeg/es mpeg/ps mpeg/ts null/null qt/qt sdl/sdl \
@@ -39,8 +39,7 @@ INTERFACE =   src/interface/main.o \
                src/interface/interface.o \
                src/interface/intf_msg.o \
                src/interface/intf_playlist.o \
-               src/interface/intf_channels.o \
-               src/interface/intf_urldecode.o \
+               src/interface/intf_channels.o
 
 INPUT =                src/input/input.o \
                src/input/input_ext-dec.o \
@@ -73,8 +72,8 @@ AC3_DECODER = src/ac3_decoder/ac3_decoder_thread.o \
                src/ac3_decoder/ac3_rematrix.o \
                src/ac3_decoder/ac3_imdct.o
 
-AC3_SPDIF = src/ac3_spdif/ac3_spdif.o \
-               src/ac3_spdif/ac3_iec958.o
+AC3_SPDIF =    src/ac3_spdif/ac3_spdif.o \
+               src/ac3_spdif/ac3_iec958.o
 
 LPCM_DECODER = src/lpcm_decoder/lpcm_decoder_thread.o \
                src/lpcm_decoder/lpcm_decoder.o
@@ -107,7 +106,7 @@ C_OBJ =             $(INTERFACE) \
                $(VIDEO_OUTPUT) \
                $(AUDIO_OUTPUT) \
                $(AC3_DECODER) \
-        $(AC3_SPDIF) \
+               $(AC3_SPDIF) \
                $(LPCM_DECODER) \
                $(AUDIO_DECODER) \
                $(SPU_DECODER) \
@@ -317,12 +316,7 @@ endif
 $(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile
 $(C_OBJ): %.o: .dep/%.d
 $(C_OBJ): %.o: %.c
-ifneq (,$(findstring darwin,$(SYS)))
-#this is uglier of all
-       @if test "src/ac3_decoder/ac3_imdct.c" = "$<"; then $(CC) `echo $(CFLAGS) | sed -e 's/-O3/-O/'` -c -o $@ $<; echo "(CC) `echo $(CFLAGS) | sed -e 's/-O3/-O/'` -c -o $@ $<"; else $(CC) $(CFLAGS) -c -o $@ $<; echo "$(CC) $(CFLAGS) -c -o $@ $<"; fi
-else
        $(CC) $(CFLAGS) -c -o $@ $<
-endif
 
 $(CPP_OBJ): %.o: Makefile.opts Makefile.dep Makefile
 $(CPP_OBJ): %.o: .dep/%.dpp
@@ -333,7 +327,7 @@ $(CPP_OBJ): %.o: %.cpp
 # Main application target
 #
 vlc: Makefile.opts Makefile.dep Makefile $(H_OBJ) $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ)
-       $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(LCFLAGS)
+       $(CC) $(CFLAGS) -o $@ $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(LCFLAGS) $(LIB)
 ifeq ($(SYS),beos)
        rm -f ./lib/_APP_
        ln -s ../vlc ./lib/_APP_