-Unification of gnome/gtk intefaces: now all the file are in plugin/gtk.

[vlc] / Makefile

diff --git a/Makefile b/Makefile
index b62b1372eac429fa2de3edd8502c8becc7453bf1..831eff52f4bf7b90a6c864432b8fc099f8d65d27 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -12,8 +12,8 @@
 # All possible plugin directories, needed for make clean
 #
 PLUGINS_DIR := alsa beos darwin dsp dummy \
-               dvd esd fb ggi glide gnome gtk \
-               idct \
+               dvd esd fb ggi glide gtk \
+               downmix idct imdct \
                macosx mga \
                motion \
                mpeg null qt sdl \
@@ -23,8 +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/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 \
@@ -36,29 +38,26 @@ PLUGINS_TARGETS := alsa/alsa beos/beos darwin/darwin dsp/dsp dummy/dummy \
 INTERFACE =    src/interface/main.o \
                src/interface/interface.o \
                src/interface/intf_msg.o \
-               src/interface/intf_cmd.o \
-               src/interface/intf_ctrl.o \
                src/interface/intf_playlist.o \
                src/interface/intf_channels.o \
-               src/interface/intf_console.o \
                src/interface/intf_urldecode.o \
 
-INPUT =                src/input/input_ext-dec.o \
+INPUT =                src/input/input.o \
+               src/input/input_ext-dec.o \
                src/input/input_ext-intf.o \
                src/input/input_dec.o \
                src/input/input_programs.o \
                src/input/input_netlist.o \
                src/input/input_clock.o \
-               src/input/input.o \
                src/input/mpeg_system.o
 
 AUDIO_OUTPUT =         src/audio_output/audio_output.o \
-               src/audio_output/aout_fifo.o \
+               src/audio_output/aout_ext-dec.o \
                src/audio_output/aout_u8.o \
                src/audio_output/aout_s8.o \
                src/audio_output/aout_u16.o \
                src/audio_output/aout_s16.o \
-        src/audio_output/aout_spdif.o
+               src/audio_output/aout_spdif.o
 
 VIDEO_OUTPUT =         src/video_output/video_output.o \
                src/video_output/video_text.o \
@@ -72,15 +71,12 @@ AC3_DECODER =       src/ac3_decoder/ac3_decoder_thread.o \
                src/ac3_decoder/ac3_bit_allocate.o \
                src/ac3_decoder/ac3_mantissa.o \
                src/ac3_decoder/ac3_rematrix.o \
-               src/ac3_decoder/ac3_imdct.o \
-               src/ac3_decoder/ac3_downmix.o \
-               src/ac3_decoder/ac3_downmix_c.o
+               src/ac3_decoder/ac3_imdct.o
 
 AC3_SPDIF = src/ac3_spdif/ac3_spdif.o \
-        src/ac3_spdif/ac3_iec958.o
+               src/ac3_spdif/ac3_iec958.o
 
-LPCM_DECODER = src/lpcm_decoder/lpcm_decoder_thread.o \
-               src/lpcm_decoder/lpcm_decoder.o
+LPCM_DECODER = src/lpcm_decoder/lpcm_decoder_thread.o
 
 AUDIO_DECODER =        src/audio_decoder/audio_decoder.o \
                src/audio_decoder/adec_generic.o \
@@ -102,7 +98,6 @@ VIDEO_DECODER =      src/video_decoder/video_decoder.o
 
 MISC =         src/misc/mtime.o \
                src/misc/tests.o \
-               src/misc/rsc_files.o \
                src/misc/modules.o \
                src/misc/netutils.o
 
@@ -321,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
@@ -358,5 +348,4 @@ $(PLUGIN_OBJ): FORCE
 builtins: Makefile.modules Makefile.opts Makefile.dep Makefile $(BUILTIN_OBJ)
 $(BUILTIN_OBJ): FORCE
        cd $(shell echo " "$(PLUGINS_TARGETS)" " | sed -e 's@.* \([^/]*/\)'$(@:lib/%.a=%)' .*@plugins/\1@' -e 's@^ .*@@') && $(MAKE) $(@:%=../../%)
-       $(RANLIB) $@