Mercurial > mplayer.hg

comparison Makefile @ 26491:d010bd754e80

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge libmpdemux/Makefile into top-level Makefile.
author diego
date Thu, 24 Apr 2008 22:05:43 +0000
parents 17650f2caef1
children 474d0127039a
comparison
equal deleted inserted replaced
26490:17650f2caef1 26491:d010bd754e80
148 libmpcodecs/vf_vo.c \ 148 libmpcodecs/vf_vo.c \
149 libmpcodecs/vf_yadif.c \ 149 libmpcodecs/vf_yadif.c \
150 libmpcodecs/vf_yuvcsp.c \ 150 libmpcodecs/vf_yuvcsp.c \
151 libmpcodecs/vf_yuy2.c \ 151 libmpcodecs/vf_yuy2.c \
152 libmpcodecs/vf_yvu9.c \ 152 libmpcodecs/vf_yvu9.c \
153 libmpdemux/aac_hdr.c \
154 libmpdemux/asfheader.c \
155 libmpdemux/aviheader.c \
156 libmpdemux/aviprint.c \
157 libmpdemux/demuxer.c \
158 libmpdemux/demux_aac.c \
159 libmpdemux/demux_asf.c \
160 libmpdemux/demux_audio.c \
161 libmpdemux/demux_avi.c \
162 libmpdemux/demux_demuxers.c \
163 libmpdemux/demux_film.c \
164 libmpdemux/demux_fli.c \
165 libmpdemux/demux_lmlm4.c \
166 libmpdemux/demux_mf.c \
167 libmpdemux/demux_mkv.c \
168 libmpdemux/demux_mov.c \
169 libmpdemux/demux_mpg.c \
170 libmpdemux/demux_nsv.c \
171 libmpdemux/demux_nuv.c \
172 libmpdemux/demux_pva.c \
173 libmpdemux/demux_rawaudio.c \
174 libmpdemux/demux_rawvideo.c \
175 libmpdemux/demux_realaud.c \
176 libmpdemux/demux_real.c \
177 libmpdemux/demux_roq.c \
178 libmpdemux/demux_smjpeg.c \
179 libmpdemux/demux_ts.c \
180 libmpdemux/demux_ty.c \
181 libmpdemux/demux_ty_osd.c \
182 libmpdemux/demux_viv.c \
183 libmpdemux/demux_vqf.c \
184 libmpdemux/demux_y4m.c \
185 libmpdemux/ebml.c \
186 libmpdemux/extension.c \
187 libmpdemux/mf.c \
188 libmpdemux/mp3_hdr.c \
189 libmpdemux/mp_taglists.c \
190 libmpdemux/mpeg_hdr.c \
191 libmpdemux/mpeg_packetizer.c \
192 libmpdemux/parse_es.c \
193 libmpdemux/parse_mp4.c \
194 libmpdemux/video.c \
195 libmpdemux/yuv4mpeg.c \
196 libmpdemux/yuv4mpeg_ratio.c \
153 libvo/aclib.c \ 197 libvo/aclib.c \
154 libvo/osd.c \ 198 libvo/osd.c \
155 libvo/sub.c \ 199 libvo/sub.c \
156 osdep/$(GETCH) \ 200 osdep/$(GETCH) \
157 osdep/$(TIMER) \ 201 osdep/$(TIMER) \
176 SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \ 220 SRCS_COMMON-$(DVDREAD) += stream/stream_dvd.c \
177 stream/stream_dvd_common.c 221 stream/stream_dvd_common.c
178 SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c 222 SRCS_COMMON-$(FAAD) += libmpcodecs/ad_faad.c
179 SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c 223 SRCS_COMMON-$(FREETYPE) += libvo/font_load_ft.c
180 SRCS_COMMON-$(FTP) += stream/stream_ftp.c 224 SRCS_COMMON-$(FTP) += stream/stream_ftp.c
225 SRCS_COMMON-$(GIF) += libmpdemux/demux_gif.c
181 SRCS_COMMON-$(HAVE_POSIX_SELECT) += libmpcodecs/vf_bmovl.c 226 SRCS_COMMON-$(HAVE_POSIX_SELECT) += libmpcodecs/vf_bmovl.c
182 SRCS_COMMON-$(HAVE_SYS_MMAN_H) += osdep/mmap_anon.c 227 SRCS_COMMON-$(HAVE_SYS_MMAN_H) += osdep/mmap_anon.c
183 SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c 228 SRCS_COMMON-$(HAVE_SYS_MMAN_H) += libaf/af_export.c
184 SRCS_COMMON-$(JPEG) += libmpcodecs/vd_ijpg.c 229 SRCS_COMMON-$(JPEG) += libmpcodecs/vd_ijpg.c
185 SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c 230 SRCS_COMMON-$(LADSPA) += libaf/af_ladspa.c
209 libmpcodecs/vf_mcdeint.c \ 254 libmpcodecs/vf_mcdeint.c \
210 libmpcodecs/vf_qp.c \ 255 libmpcodecs/vf_qp.c \
211 libmpcodecs/vf_spp.c \ 256 libmpcodecs/vf_spp.c \
212 libmpcodecs/vf_uspp.c \ 257 libmpcodecs/vf_uspp.c \
213 258
259 SRCS_COMMON-$(LIBAVFORMAT) += libmpdemux/demux_lavf.c
214 SRCS_COMMON-$(LIBDCA) += libmpcodecs/ad_libdca.c 260 SRCS_COMMON-$(LIBDCA) += libmpcodecs/ad_libdca.c
215 SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ 261 SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \
216 libmpcodecs/vd_libdv.c 262 libmpcodecs/vd_libdv.c \
263 libmpdemux/demux_rawdv.c
217 SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c 264 SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c
218 SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c 265 SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c
219 SRCS_COMMON-$(LIBNEMESI) += stream/stream_nemesi.c 266 SRCS_COMMON-$(LIBNEMESI) += libmpdemux/demux_nemesi.c \
267 stream/stream_nemesi.c
268 SRCS_COMMON-$(LIBNUT) += libmpdemux/demux_nut.c
220 SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c 269 SRCS_COMMON-$(LIBPOSTPROC) += libmpcodecs/vf_pp.c
221 SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c 270 SRCS_COMMON-$(LIBSMBCLIENT) += stream/stream_smb.c
222 SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c 271 SRCS_COMMON-$(LIBTHEORA) += libmpcodecs/vd_theora.c
223 SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c 272 SRCS_COMMON-$(LIBVORBIS) += libmpcodecs/ad_libvorbis.c \
273 libmpdemux/demux_ogg.c
224 SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c 274 SRCS_COMMON-$(MACOSX_FINDER_SUPPORT) += osdep/macosx_finder_args.c
225 SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c 275 SRCS_COMMON-$(MP3LIB) += libmpcodecs/ad_mp3lib.c
226 SRCS_COMMON-$(MPLAYER_NETWORK) += stream/stream_netstream.c \ 276 SRCS_COMMON-$(MPLAYER_NETWORK) += stream/stream_netstream.c \
227 stream/asf_mmst_streaming.c \ 277 stream/asf_mmst_streaming.c \
228 stream/asf_streaming.c \ 278 stream/asf_streaming.c \
239 stream/realrtsp/real.c \ 289 stream/realrtsp/real.c \
240 stream/realrtsp/rmff.c \ 290 stream/realrtsp/rmff.c \
241 stream/realrtsp/sdpplin.c \ 291 stream/realrtsp/sdpplin.c \
242 stream/realrtsp/xbuffer.c \ 292 stream/realrtsp/xbuffer.c \
243 293
244 SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c 294 SRCS_COMMON-$(MUSEPACK) += libmpcodecs/ad_mpc.c \
295 libmpdemux/demux_mpc.c
245 SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \ 296 SRCS_COMMON-$(NATIVE_RTSP) += stream/stream_rtsp.c \
246 stream/freesdp/common.c \ 297 stream/freesdp/common.c \
247 stream/freesdp/errorlist.c \ 298 stream/freesdp/errorlist.c \
248 stream/freesdp/parser.c \ 299 stream/freesdp/parser.c \
249 stream/librtsp/rtsp.c \ 300 stream/librtsp/rtsp.c \
266 SRCS_COMMON-$(RADIO_CAPTURE) += stream/audio_in.c 317 SRCS_COMMON-$(RADIO_CAPTURE) += stream/audio_in.c
267 SRCS_COMMON-$(REAL_CODECS) += libmpcodecs/ad_realaud.c \ 318 SRCS_COMMON-$(REAL_CODECS) += libmpcodecs/ad_realaud.c \
268 libmpcodecs/vd_realvid.c 319 libmpcodecs/vd_realvid.c
269 SRCS_COMMON-$(SPEEX) += libmpcodecs/ad_speex.c 320 SRCS_COMMON-$(SPEEX) += libmpcodecs/ad_speex.c
270 SRCS_COMMON-$(STREAM_CACHE) += stream/cache2.c 321 SRCS_COMMON-$(STREAM_CACHE) += stream/cache2.c
271 SRCS_COMMON-$(STREAMING_LIVE555) += stream/stream_livedotcom.c 322 SRCS_COMMON-$(STREAMING_LIVE555) += libmpdemux/demux_rtp.cpp \
323 libmpdemux/demux_rtp_codec.cpp \
324 stream/stream_livedotcom.c \
325
272 SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \ 326 SRCS_COMMON-$(TREMOR_INTERNAL) += tremor/bitwise.c \
273 tremor/block.c \ 327 tremor/block.c \
274 tremor/codebook.c \ 328 tremor/codebook.c \
275 tremor/floor0.c \ 329 tremor/floor0.c \
276 tremor/floor1.c \ 330 tremor/floor1.c \
300 libmpcodecs/ad_twin.c \ 354 libmpcodecs/ad_twin.c \
301 libmpcodecs/vd_dmo.c \ 355 libmpcodecs/vd_dmo.c \
302 libmpcodecs/vd_dshow.c \ 356 libmpcodecs/vd_dshow.c \
303 libmpcodecs/vd_vfw.c \ 357 libmpcodecs/vd_vfw.c \
304 libmpcodecs/vd_vfwex.c \ 358 libmpcodecs/vd_vfwex.c \
359 libmpdemux/demux_avs.c \
305 360
306 SRCS_COMMON-$(XANIM_CODECS) += libmpcodecs/vd_xanim.c 361 SRCS_COMMON-$(XANIM_CODECS) += libmpcodecs/vd_xanim.c
362 SRCS_COMMON-$(XMMS_PLUGINS) += libmpdemux/demux_xmms.c
307 SRCS_COMMON-$(XVID4) += libmpcodecs/vd_xvid4.c 363 SRCS_COMMON-$(XVID4) += libmpcodecs/vd_xvid4.c
308 SRCS_COMMON-$(ZORAN) += libmpcodecs/vd_zrmjpeg.c \ 364 SRCS_COMMON-$(ZORAN) += libmpcodecs/vd_zrmjpeg.c \
309 libmpcodecs/vf_zrmjpeg.c 365 libmpcodecs/vf_zrmjpeg.c
310 366
311 367
394 xvid_vbr.c \ 450 xvid_vbr.c \
395 libmpcodecs/ae.c \ 451 libmpcodecs/ae.c \
396 libmpcodecs/ae_pcm.c \ 452 libmpcodecs/ae_pcm.c \
397 libmpcodecs/ve.c \ 453 libmpcodecs/ve.c \
398 libmpcodecs/ve_raw.c \ 454 libmpcodecs/ve_raw.c \
455 libmpdemux/muxer.c \
456 libmpdemux/muxer_avi.c \
457 libmpdemux/muxer_mpeg.c \
458 libmpdemux/muxer_rawaudio.c \
459 libmpdemux/muxer_rawvideo.c \
399 460
400 SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c 461 SRCS_MENCODER-$(FAAC) += libmpcodecs/ae_faac.c
401 SRCS_MENCODER-$(LIBAVCODEC) += libmpcodecs/ae_lavc.c libmpcodecs/ve_lavc.c 462 SRCS_MENCODER-$(LIBAVCODEC) += libmpcodecs/ae_lavc.c libmpcodecs/ve_lavc.c
463 SRCS_MENCODER-$(LIBAVFORMAT) += libmpdemux/muxer_lavf.c
402 SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c 464 SRCS_MENCODER-$(LIBDV) += libmpcodecs/ve_libdv.c
403 SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c 465 SRCS_MENCODER-$(LIBLZO) += libmpcodecs/ve_nuv.c
404 SRCS_MENCODER-$(MP3LAME) += libmpcodecs/ae_lame.c 466 SRCS_MENCODER-$(MP3LAME) += libmpcodecs/ae_lame.c
405 SRCS_MENCODER-$(QTX_CODECS) += libmpcodecs/ve_qtvideo.c 467 SRCS_MENCODER-$(QTX_CODECS) += libmpcodecs/ve_qtvideo.c
406 SRCS_MENCODER-$(TOOLAME) += libmpcodecs/ae_toolame.c 468 SRCS_MENCODER-$(TOOLAME) += libmpcodecs/ae_toolame.c
407 SRCS_MENCODER-$(TWOLAME) += libmpcodecs/ae_twolame.c 469 SRCS_MENCODER-$(TWOLAME) += libmpcodecs/ae_twolame.c
408 SRCS_MENCODER-$(WIN32DLL) += libmpcodecs/ve_vfw.c 470 SRCS_MENCODER-$(WIN32DLL) += libmpcodecs/ve_vfw.c
409 SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c 471 SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c
410 SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c 472 SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c
411 473
412 COMMON_LIBS = libmpdemux/libmpdemux.a \ 474 COMMON_LIBS = libswscale/libswscale.a \
413 libswscale/libswscale.a \
414 475
415 COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a 476 COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a
416 COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a 477 COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a
417 COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a 478 COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a
418 COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a 479 COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a
424 COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/dvdread.a 485 COMMON_LIBS-$(DVDREAD_INTERNAL) += dvdread/dvdread.a
425 COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a 486 COMMON_LIBS-$(DVDCSS_INTERNAL) += libdvdcss/libdvdcss.a
426 487
427 LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a 488 LIBS_MPLAYER-$(VIDIX) += vidix/vidix.a
428 489
429 LIBS_MENCODER = libmpdemux/libmpmux.a \
430
431 ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) 490 ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
432 ALL_PRG-$(MENCODER) += mencoder$(EXESUF) 491 ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
433 492
434 COMMON_LIBS += $(COMMON_LIBS-yes) 493 COMMON_LIBS += $(COMMON_LIBS-yes)
435 LIBS_MPLAYER += $(LIBS_MPLAYER-yes) 494 LIBS_MPLAYER += $(LIBS_MPLAYER-yes)
449 libavcodec \ 508 libavcodec \
450 libavformat \ 509 libavformat \
451 libavutil \ 510 libavutil \
452 libdvdcss \ 511 libdvdcss \
453 libfaad2 \ 512 libfaad2 \
454 libmpdemux \
455 libmpeg2 \ 513 libmpeg2 \
456 libpostproc \ 514 libpostproc \
457 libswscale \ 515 libswscale \
458 mp3lib \ 516 mp3lib \
459 vidix \ 517 vidix \
473 libao2 \ 531 libao2 \
474 libass \ 532 libass \
475 libmenu \ 533 libmenu \
476 libmpcodecs \ 534 libmpcodecs \
477 libmpcodecs/native \ 535 libmpcodecs/native \
536 libmpdemux \
478 libvo \ 537 libvo \
479 osdep \ 538 osdep \
480 stream \ 539 stream \
481 stream/freesdp \ 540 stream/freesdp \
482 stream/librtsp \ 541 stream/librtsp \
506 $(MAKE) -C $(part) 565 $(MAKE) -C $(part)
507 endef 566 endef
508 567
509 $(foreach part,$(PARTS),$(eval $(RECURSIVE_RULE))) 568 $(foreach part,$(PARTS),$(eval $(RECURSIVE_RULE)))
510 569
511 libmpdemux/libmpmux.a:
512 $(MAKE) -C libmpdemux libmpmux.a
513
514 mplayer$(EXESUF): $(MPLAYER_DEPS) 570 mplayer$(EXESUF): $(MPLAYER_DEPS)
515 $(CC) -o $@ $^ $(LDFLAGS_MPLAYER) 571 $(CC) -o $@ $^ $(LDFLAGS_MPLAYER)
516 572
517 mencoder$(EXESUF): $(MENCODER_DEPS) 573 mencoder$(EXESUF): $(MENCODER_DEPS)
518 $(CC) -o $@ $^ $(LDFLAGS_MENCODER) 574 $(CC) -o $@ $^ $(LDFLAGS_MENCODER)
531 codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o 587 codec-cfg-test$(EXESUF): codecs.conf.h codec-cfg.h mp_msg.o osdep/getch2.o
532 $(CC) -I. -DTESTING codec-cfg.c mp_msg.o osdep/getch2.o -ltermcap -o $@ 588 $(CC) -I. -DTESTING codec-cfg.c mp_msg.o osdep/getch2.o -ltermcap -o $@
533 589
534 osdep/mplayer-rc.o: osdep/mplayer.rc version.h 590 osdep/mplayer-rc.o: osdep/mplayer.rc version.h
535 $(WINDRES) -o $@ $< 591 $(WINDRES) -o $@ $<
592
593 libmpdemux/demux_lavf.o libmpdemux/demux_lavf.d libmpdemux/mp_taglists.o libmpdemux/mp_taglists.d: CFLAGS += -Ilibavcodec
536 594
537 install: install-dirs $(INSTALL_TARGETS) 595 install: install-dirs $(INSTALL_TARGETS)
538 596
539 install-dirs: 597 install-dirs:
540 $(INSTALL) -d $(BINDIR) 598 $(INSTALL) -d $(BINDIR)
670 libswscale/libswscale.a libavutil/libavutil.a $(TOOLS_COMMON_LIBS) 728 libswscale/libswscale.a libavutil/libavutil.a $(TOOLS_COMMON_LIBS)
671 729
672 TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32 730 TOOLS/vfw2menc$(EXESUF): TOOLS/vfw2menc.c -lwinmm -lole32
673 731
674 #FIXME: Linking is broken, help welcome. 732 #FIXME: Linking is broken, help welcome.
675 TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c libmpdemux/libmpdemux.a $(TOOLS_COMMON_LIBS) 733 TOOLS/vivodump$(EXESUF): TOOLS/vivodump.c $(TOOLS_COMMON_LIBS)
676 734
677 fastmemcpybench: TOOLS/fastmemcpybench.c 735 fastmemcpybench: TOOLS/fastmemcpybench.c
678 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-mmx$(EXESUF) -DNAME=\"mmx\" -DHAVE_MMX 736 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-mmx$(EXESUF) -DNAME=\"mmx\" -DHAVE_MMX
679 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-k6$(EXESUF) -DNAME=\"k6\ \" -DHAVE_MMX -DHAVE_3DNOW 737 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-k6$(EXESUF) -DNAME=\"k6\ \" -DHAVE_MMX -DHAVE_3DNOW
680 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-k7$(EXESUF) -DNAME=\"k7\ \" -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2 738 $(CC) $(CFLAGS) $< -o TOOLS/fastmem-k7$(EXESUF) -DNAME=\"k7\ \" -DHAVE_MMX -DHAVE_3DNOW -DHAVE_MMX2
694 %.so.6.0: %.o 752 %.so.6.0: %.o
695 ld -shared -o $@ $< -ldl -lc 753 ld -shared -o $@ $< -ldl -lc
696 754
697 # FIXME: netstream linking is a mess that should be fixed properly some day. 755 # FIXME: netstream linking is a mess that should be fixed properly some day.
698 # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled. 756 # It does not work with either GUI, LIVE555, libavformat, cdparanoia enabled.
699 NETSTREAM_DEPS = libmpdemux/libmpdemux.a \ 757 NETSTREAM_DEPS = dvdread/libdvdread.a \
700 dvdread/libdvdread.a \
701 libdvdcss/libdvdcss.a \ 758 libdvdcss/libdvdcss.a \
702 libavutil/libavutil.a \ 759 libavutil/libavutil.a \
703 m_option.o \ 760 m_option.o \
704 m_struct.o \ 761 m_struct.o \
705 $(TOOLS_COMMON_LIBS) 762 $(TOOLS_COMMON_LIBS)