comparison Makefile @ 7112:b1397d95471f

final (?) libvo2 cleanup patch by Joey Parrish
author alex
date Wed, 28 Aug 2002 16:09:31 +0000
parents b65b78640d49
children 0dc9cb756b68
comparison
equal deleted inserted replaced
7111:b65b78640d49 7112:b1397d95471f
36 SRCS_MPLAYER = mplayer.c mp_msg.c $(SRCS_COMMON) mixer.c mp-opt-reg.c 36 SRCS_MPLAYER = mplayer.c mp_msg.c $(SRCS_COMMON) mixer.c mp-opt-reg.c
37 37
38 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o) 38 OBJS_MENCODER = $(SRCS_MENCODER:.c=.o)
39 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o) 39 OBJS_MPLAYER = $(SRCS_MPLAYER:.c=.o)
40 40
41 ifeq ($(VO2),yes)
42 VO_LIBS = -Llibvo2 -lvo2
43 VO_INC = -Ilibvo2
44 else
45 VO_LIBS = -Llibvo -lvo 41 VO_LIBS = -Llibvo -lvo
46 VO_INC = -Ilibvo 42 VO_INC = -Ilibvo
47 endif
48 V_LIBS = $(X_LIB) $(MP1E_LIB) $(GGI_LIB) $(MLIB_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA_LIB) $(DIRECTFB_LIB) 43 V_LIBS = $(X_LIB) $(MP1E_LIB) $(GGI_LIB) $(MLIB_LIB) $(SDL_LIB) $(SVGA_LIB) $(AA_LIB) $(DIRECTFB_LIB)
49 44
50 AO_LIBS = -Llibao2 -lao2 45 AO_LIBS = -Llibao2 -lao2
51 A_LIBS = $(ALSA_LIB) $(ARTS_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(SGIAUDIO_LIB) 46 A_LIBS = $(ALSA_LIB) $(ARTS_LIB) $(NAS_LIB) $(MAD_LIB) $(VORBIS_LIB) $(FAAD_LIB) $(SGIAUDIO_LIB)
52 47
55 ifeq ($(VIDIX),yes) 50 ifeq ($(VIDIX),yes)
56 MISC_LIBS += -Llibdha -ldha -Lvidix -lvidix 51 MISC_LIBS += -Llibdha -ldha -Lvidix -lvidix
57 endif 52 endif
58 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) $(CDPARANOIA_INC)# -Wall 53 CFLAGS = $(OPTFLAGS) -Ilibmpdemux -Iloader $(VO_INC) $(EXTRA_INC) $(CDPARANOIA_INC)# -Wall
59 54
60 PARTS = libfame libmpdemux libmpcodecs mp3lib liba52 libmp1e libmpeg2 libavcodec libao2 drivers linux postproc input libmpdvdkit 55 PARTS = libfame libmpdemux libmpcodecs mp3lib liba52 libmp1e libmpeg2 libavcodec libao2 drivers linux postproc input libmpdvdkit libvo
61 ifeq ($(VIDIX),yes) 56 ifeq ($(VIDIX),yes)
62 PARTS += libdha vidix 57 PARTS += libdha vidix
63 endif 58 endif
64 ifeq ($(VO2),yes)
65 PARTS += libvo2
66 else
67 PARTS += libvo
68 endif
69
70 ifeq ($(GUI),yes) 59 ifeq ($(GUI),yes)
71 PARTS += Gui 60 PARTS += Gui
72 endif 61 endif
73 62
74 ifneq ($(W32_LIB),) 63 ifneq ($(W32_LIB),)
95 all: $(ALL_PRG) 84 all: $(ALL_PRG)
96 85
97 .c.o: 86 .c.o:
98 $(CC) -c $(CFLAGS) -o $@ $< 87 $(CC) -c $(CFLAGS) -o $@ $<
99 88
100 COMMON_DEPS = libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a 89 COMMON_DEPS = libmpdemux/libmpdemux.a libmpcodecs/libmpcodecs.a libao2/libao2.a liba52/liba52.a mp3lib/libMP3.a libmpeg2/libmpeg2.a linux/libosdep.a postproc/libpostproc.a input/libinput.a libvo/libvo.a
101 90
102 ifeq ($(VIDIX),yes) 91 ifeq ($(VIDIX),yes)
103 COMMON_DEPS += libdha/libdha.so vidix/libvidix.a 92 COMMON_DEPS += libdha/libdha.so vidix/libvidix.a
104 endif
105 ifeq ($(VO2),yes)
106 COMMON_DEPS += libvo2/libvo2.a
107 else
108 COMMON_DEPS += libvo/libvo.a
109 endif 93 endif
110 ifeq ($(FAME),yes) 94 ifeq ($(FAME),yes)
111 COMMON_DEPS += libfame/libfame.a 95 COMMON_DEPS += libfame/libfame.a
112 endif 96 endif
113 ifeq ($(DVDKIT),yes) 97 ifeq ($(DVDKIT),yes)
164 libmpeg2/libmpeg2.a: 148 libmpeg2/libmpeg2.a:
165 $(MAKE) -C libmpeg2 149 $(MAKE) -C libmpeg2
166 150
167 libvo/libvo.a: 151 libvo/libvo.a:
168 $(MAKE) -C libvo 152 $(MAKE) -C libvo
169
170 libvo2/libvo2.a:
171 $(MAKE) -C libvo2
172 153
173 libao2/libao2.a: 154 libao2/libao2.a:
174 $(MAKE) -C libao2 155 $(MAKE) -C libao2
175 156
176 liba52/liba52.a: 157 liba52/liba52.a: