X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=463b9784990333dd913ec5f8dc5b845f55b93753;hb=ae09661ba61196c0069c7ec06f36276a059ef7ff;hp=5d6b62419c76e43696c2c5b7252901ad3e55ed42;hpb=53b978f8650fd329bf5298a05c9f8a055ac56fe4;p=vlc

diff --git a/Makefile b/Makefile
index 5d6b62419c..463b978499 100644
--- a/Makefile
+++ b/Makefile
@@ -48,6 +48,7 @@ PLUGINS_DIR :=	ac3_adec \
 		spudec \
 		text \
 		vcd \
+		win32 \
 		x11
 
 PLUGINS_TARGETS := ac3_adec/ac3_adec \
@@ -61,6 +62,8 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
 		chroma/chroma_i420_yuy2_mmx \
 		chroma/chroma_i422_yuy2 \
 		chroma/chroma_i422_yuy2_mmx \
+		chroma/chroma_i420_ymga \
+		chroma/chroma_i420_ymga_mmx \
 		directx/directx \
 		dsp/dsp \
 		dummy/dummy \
@@ -98,6 +101,7 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
 		memcpy/memcpymmxext \
 		memcpy/memcpy3dn \
 		mga/mga \
+		mga/xmga \
 		motion/motion \
 		motion/motionmmx \
 		motion/motionmmxext \
@@ -114,16 +118,17 @@ PLUGINS_TARGETS := ac3_adec/ac3_adec \
 		text/ncurses \
 		text/rc \
 		vcd/vcd \
+		win32/win32 \
 		x11/x11 \
 		x11/xvideo
 
 #
 # C Objects
 # 
-INTERFACE := main interface intf_msg intf_playlist
+INTERFACE := main interface intf_msg intf_playlist intf_eject
 INPUT := input input_ext-dec input_ext-intf input_dec input_programs input_clock mpeg_system
 VIDEO_OUTPUT := video_output video_text vout_pictures vout_subpictures
-AUDIO_OUTPUT := audio_output aout_ext-dec aout_u8 aout_s8 aout_u16 aout_s16 aout_spdif
+AUDIO_OUTPUT := audio_output aout_common aout_ext-dec aout_spdif
 MISC := mtime modules netutils iso_lang
 
 C_OBJ :=	$(INTERFACE:%=src/interface/%.o) \
@@ -139,6 +144,10 @@ ifeq ($(NEED_GETOPT),1)
 C_OBJ += extras/GNUgetopt/getopt.o extras/GNUgetopt/getopt1.o 
 endif
 
+ifeq ($(NEED_SYMBOLS),1)
+C_OBJ += src/misc/symbols.o
+endif
+
 ifeq ($(SYS),beos)
 CPP_OBJ :=	src/misc/beos_specific.o
 endif
@@ -159,24 +168,6 @@ VLC_OBJ := $(C_OBJ) $(CPP_OBJ) $(BUILTIN_OBJ) $(RESOURCE_OBJ)
 #
 H_OBJ :=	src/misc/modules_builtin.h
 
-#
-# Included headers which don't get noticed by Makefile.dep
-#
-H_DEP :=	videolan/vlc.h \
-		defs.h \
-		config.h \
-		int_types.h \
-		modules_inner.h \
-		common.h \
-		beos_specific.h \
-		darwin_specific.h \
-		win32_specific.h \
-		intf_msg.h \
-		threads.h \
-		mtime.h \
-		modules.h \
-		main.h
-
 #
 # Other lists of files
 #
@@ -536,9 +527,9 @@ ifneq (,$(BUILTINS))
 	@for i in $(BUILTINS) ; do \
 		echo "        ALLOCATE_BUILTIN("$$i"); \\" >> $@ ; \
 	done
+endif
 	@echo "    } while( 0 );" >> $@ ;
 	@echo "" >> $@ ;
-endif
 
 $(C_DEP): %.d: FORCE
 	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
@@ -547,13 +538,13 @@ $(CPP_DEP): %.dpp: FORCE
 	@$(MAKE) -s --no-print-directory -f Makefile.dep $@
 
 $(C_OBJ): %.o: Makefile.opts Makefile.dep Makefile
-$(C_OBJ): %.o: $(H_OBJ) $(H_DEP:%=include/%)
+$(C_OBJ): %.o: $(H_OBJ)
 $(C_OBJ): %.o: .dep/%.d
 $(C_OBJ): %.o: %.c
 	$(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $<
 
 $(CPP_OBJ): %.o: Makefile.opts Makefile.dep Makefile
-$(CPP_OBJ): %.o: $(H_OBJ) $(H_DEP:%=include/%)
+$(CPP_OBJ): %.o: $(H_OBJ)
 $(CPP_OBJ): %.o: .dep/%.dpp
 $(CPP_OBJ): %.o: %.cpp
 	$(CC) $(CFLAGS) $(CFLAGS_VLC) -c -o $@ $<