comparison Makefile @ 26577:d1e4656332cf

cosmetics: Move some variable declarations to better places.
author diego
date Wed, 30 Apr 2008 13:58:26 +0000
parents 6fc2079377cd
children 7a7a294e07e2
comparison
equal deleted inserted replaced
26576:89b58769e45b 26577:d1e4656332cf
580 SRCS_MPLAYER-$(VIDIX_RAGE128) += vidix/rage128_vid.c 580 SRCS_MPLAYER-$(VIDIX_RAGE128) += vidix/rage128_vid.c
581 SRCS_MPLAYER-$(VIDIX_S3) += vidix/s3_vid.c 581 SRCS_MPLAYER-$(VIDIX_S3) += vidix/s3_vid.c
582 SRCS_MPLAYER-$(VIDIX_SIS) += vidix/sis_vid.c vidix/sis_bridge.c 582 SRCS_MPLAYER-$(VIDIX_SIS) += vidix/sis_vid.c vidix/sis_bridge.c
583 SRCS_MPLAYER-$(VIDIX_UNICHROME) += vidix/unichrome_vid.c 583 SRCS_MPLAYER-$(VIDIX_UNICHROME) += vidix/unichrome_vid.c
584 584
585 OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o
586
587 SRCS_MENCODER = mencoder.c \ 585 SRCS_MENCODER = mencoder.c \
588 mp_msg-mencoder.c \ 586 mp_msg-mencoder.c \
589 parser-mecmd.c \ 587 parser-mecmd.c \
590 xvid_vbr.c \ 588 xvid_vbr.c \
591 libmpcodecs/ae.c \ 589 libmpcodecs/ae.c \
609 SRCS_MENCODER-$(TWOLAME) += libmpcodecs/ae_twolame.c 607 SRCS_MENCODER-$(TWOLAME) += libmpcodecs/ae_twolame.c
610 SRCS_MENCODER-$(WIN32DLL) += libmpcodecs/ve_vfw.c 608 SRCS_MENCODER-$(WIN32DLL) += libmpcodecs/ve_vfw.c
611 SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c 609 SRCS_MENCODER-$(X264) += libmpcodecs/ve_x264.c
612 SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c 610 SRCS_MENCODER-$(XVID4) += libmpcodecs/ve_xvid4.c
613 611
614 COMMON_LIBS = libswscale/libswscale.a \ 612 SRCS_COMMON += $(SRCS_COMMON-yes) $(SRCS_COMMON-yes-yes) $(SRCS_COMMON-yes-yes-yes)
613 SRCS_MENCODER += $(SRCS_MENCODER-yes)
614 SRCS_MPLAYER += $(SRCS_MPLAYER-yes)
615 615
616 COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a 616 COMMON_LIBS-$(LIBAVFORMAT_A) += libavformat/libavformat.a
617 COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a 617 COMMON_LIBS-$(LIBAVCODEC_A) += libavcodec/libavcodec.a
618 COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a 618 COMMON_LIBS-$(LIBAVUTIL_A) += libavutil/libavutil.a
619 COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a 619 COMMON_LIBS-$(LIBPOSTPROC_A) += libpostproc/libpostproc.a
620 COMMON_LIBS = libswscale/libswscale.a
621 COMMON_LIBS += $(COMMON_LIBS-yes)
622
623 OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)))
624 OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER)))
625 OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER)))
626 OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o
627 OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
628
629 MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS)
630 MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS)
620 631
621 ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) 632 ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
622 ALL_PRG-$(MENCODER) += mencoder$(EXESUF) 633 ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
623 634 ALL_PRG += $(ALL_PRG-yes)
624 COMMON_LIBS += $(COMMON_LIBS-yes)
625 OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
626 ALL_PRG += $(ALL_PRG-yes)
627
628 MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS)
629 MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS)
630
631 SRCS_COMMON += $(SRCS_COMMON-yes) $(SRCS_COMMON-yes-yes) $(SRCS_COMMON-yes-yes-yes)
632 SRCS_MENCODER += $(SRCS_MENCODER-yes)
633 SRCS_MPLAYER += $(SRCS_MPLAYER-yes)
634
635 OBJS_COMMON += $(addsuffix .o, $(basename $(SRCS_COMMON)) )
636 OBJS_MENCODER += $(addsuffix .o, $(basename $(SRCS_MENCODER)) )
637 OBJS_MPLAYER += $(addsuffix .o, $(basename $(SRCS_MPLAYER)) )
638 635
639 INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man 636 INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man
640 INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man 637 INSTALL_TARGETS-$(MENCODER) += install-mencoder install-mplayer-man
641 INSTALL_TARGETS-$(GUI) += install-gui 638 INSTALL_TARGETS-$(GUI) += install-gui
642 INSTALL_TARGETS += $(INSTALL_TARGETS-yes) 639 INSTALL_TARGETS += $(INSTALL_TARGETS-yes)