X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=e725cfd42b38edede2f95be3476618518dbbf57d;hb=fd1da66ff56c4c42e8926c2a0eacef6452f51b47;hp=f79a6b9aa57bbd25ab6c9b5acfc1d63bf499a665;hpb=c0138ec5ec4fd09b4421797c0edfaf8a56951d42;p=vlc

diff --git a/Makefile b/Makefile
index f79a6b9aa5..e725cfd42b 100644
--- a/Makefile
+++ b/Makefile
@@ -36,28 +36,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_s16.o \
+        src/audio_output/aout_spdif.o
 
 VIDEO_OUTPUT = 	src/video_output/video_output.o \
 		src/video_output/video_text.o \
@@ -72,9 +70,14 @@ AC3_DECODER =	src/ac3_decoder/ac3_decoder_thread.o \
 		src/ac3_decoder/ac3_mantissa.o \
 		src/ac3_decoder/ac3_rematrix.o \
 		src/ac3_decoder/ac3_imdct.o \
+		src/ac3_decoder/ac3_imdct_c.o \
+		src/ac3_decoder/ac3_srfft.o \
 		src/ac3_decoder/ac3_downmix.o \
 		src/ac3_decoder/ac3_downmix_c.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
 
@@ -98,7 +101,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
 
@@ -107,6 +109,7 @@ C_OBJ =		$(INTERFACE) \
 		$(VIDEO_OUTPUT) \
 		$(AUDIO_OUTPUT) \
 		$(AC3_DECODER) \
+        $(AC3_SPDIF) \
 		$(LPCM_DECODER) \
 		$(AUDIO_DECODER) \
 		$(SPU_DECODER) \
@@ -176,7 +179,7 @@ distclean: clean
 	rm -f **/*.o **/*~ *.log
 	rm -f Makefile.opts
 	rm -f include/defs.h include/config.h include/modules_builtin.h
-	rm -f config.status config.cache config.log
+	rm -f config*status config*cache config*log
 	rm -f gmon.out core build-stamp
 	rm -Rf .dep
 	rm -f .gdb_history
@@ -353,5 +356,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 $@