diff Makefile @ 2947:987c77cbb4de

last part of changes since around configure 230 applied (lirc in autodetect, VO2 support) blocks sorted for ao/vo (video/video+audio/audio)

--- a/Makefile	Sat Nov 17 10:25:48 2001 +0000
+++ b/Makefile	Sat Nov 17 11:26:26 2001 +0000
@@ -26,9 +26,17 @@
 
 SRCS_MPLAYER = mplayer.c ima4.c xacodec.c cpudetect.c mp_msg.c ac3-iec958.c find_sub.c dec_audio.c dec_video.c msvidc.c codec-cfg.c subreader.c lirc_mp.c cfgparser.c mixer.c spudec.c my_profile.c
 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
+
 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo $(EXTRA_INC) $(MADLIB_INC) # -Wall
+VO_LIBS = -Llibvo -lvo $(MLIB_LIB) $(X_LIBS)
+ifeq ($(VO2),yes)
+CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader -Ilibvo2 $(EXTRA_INC) $(MADLIB_INC) # -Wall
+VO_LIBS = -Llibvo2 -lvo2 $(MLIB_LIB) $(X_LIBS)
+endif
+
 A_LIBS = -Lmp3lib -lMP3 -Llibac3 -lac3 $(ALSA_LIB) $(ESD_LIB) $(MADLIB_LIB) $(SGI_AUDIO_LIB)
-VO_LIBS = -Llibvo -lvo $(MLIB_LIB) $(X_LIBS)
+
+
 OSDEP_LIBS = -Llinux -losdep
 PP_LIBS = -Lpostproc -lpostproc
 XA_LIBS = -Lxa -lxa
@@ -37,6 +45,10 @@
 # OBJS = $(OBJS_MENCODER) $(OBJS_MPLAYER)
 
 PARTS = libmpdemux mp3lib libac3 libmpeg2 opendivx libavcodec libvo libao2 drivers drivers/syncfb linux postproc xa
+ifeq ($(VO2),yes)
+PARTS = libmpdemux mp3lib libac3 libmpeg2 opendivx libavcodec libvo2 libao2 drivers drivers/syncfb linux postproc xa
+endif
+
 
 ifeq ($(GUI),yes)
 PARTS += Gui
@@ -68,6 +80,9 @@
 	$(CC) -c $(CFLAGS) -o $@ $<
 
 COMMONLIBS = libmpdemux/libmpdemux.a libvo/libvo.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
+ifeq ($(VO2),yes)
+COMMONLIBS = libmpdemux/libmpdemux.a libvo2/libvo2.a libao2/libao2.a libac3/libac3.a mp3lib/libMP3.a libmpeg2/libmpeg2.a opendivx/libdecore.a linux/libosdep.a postproc/libpostproc.a xa/libxa.a
+endif
 
 loader/libloader.a:
 	$(MAKE) -C loader
@@ -87,6 +102,9 @@
 libvo/libvo.a:
 	$(MAKE) -C libvo
 
+libvo2/libvo2.a:
+	$(MAKE) -C libvo2
+
 libao2/libao2.a:
 	$(MAKE) -C libao2