comparison Makefile @ 27172:fa689f1b187b

Group some variable declarations together in sensible places.
author diego
date Sat, 05 Jul 2008 09:07:24 +0000
parents 5b24c3520255
children 5c6b0b2b67b3
comparison
equal deleted inserted replaced
27171:5b24c3520255 27172:fa689f1b187b
643 OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o 643 OBJS_MPLAYER-$(PE_EXECUTABLE) += osdep/mplayer-rc.o
644 OBJS_MPLAYER += $(OBJS_MPLAYER-yes) 644 OBJS_MPLAYER += $(OBJS_MPLAYER-yes)
645 645
646 MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS) 646 MPLAYER_DEPS = $(OBJS_MPLAYER) $(OBJS_COMMON) $(COMMON_LIBS)
647 MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS) 647 MENCODER_DEPS = $(OBJS_MENCODER) $(OBJS_COMMON) $(COMMON_LIBS)
648 DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER))))
648 649
649 ALL_PRG-$(MPLAYER) += mplayer$(EXESUF) 650 ALL_PRG-$(MPLAYER) += mplayer$(EXESUF)
650 ALL_PRG-$(MENCODER) += mencoder$(EXESUF) 651 ALL_PRG-$(MENCODER) += mencoder$(EXESUF)
651 652
652 INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man 653 INSTALL_TARGETS-$(MPLAYER) += install-mplayer install-mplayer-man
698 stream/realrtsp \ 699 stream/realrtsp \
699 tremor \ 700 tremor \
700 TOOLS \ 701 TOOLS \
701 vidix \ 702 vidix \
702 703
704 ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h))
705
703 PARTS = libavcodec \ 706 PARTS = libavcodec \
704 libavformat \ 707 libavformat \
705 libavutil \ 708 libavutil \
706 libpostproc \ 709 libpostproc \
707 libswscale \ 710 libswscale \
708 711
712 ALLPARTLIBS = $(foreach part, $(PARTS), $(part)/$(part).a)
713 FFMPEGFILES = $(foreach part, $(PARTS), $(part)/*.[chS] libavcodec/*/*.[chS])
714
709 715
710 716
711 ###### generic rules ####### 717 ###### generic rules #######
712 718
713 all: $(ALL_PRG-yes) 719 all: $(ALL_PRG-yes)
725 $(CC) $(CFLAGS) -c -o $@ $< 731 $(CC) $(CFLAGS) -c -o $@ $<
726 732
727 %.ho: %.h 733 %.ho: %.h
728 $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $< 734 $(CC) $(CFLAGS) -Wno-unused -c -o $@ -x c $<
729 735
730 ALLHEADERS = $(foreach dir,$(DIRS),$(wildcard $(dir)/*.h))
731 checkheaders: $(ALLHEADERS:.h=.ho) 736 checkheaders: $(ALLHEADERS:.h=.ho)
732 737
733 dep depend: $(DEPS) 738 dep depend: $(DEPS)
734 for part in $(PARTS); do $(MAKE) -C $$part depend; done 739 for part in $(PARTS); do $(MAKE) -C $$part depend; done
735 740
736 ALLPARTLIBS = $(foreach part, $(PARTS), $(part)/$(part).a)
737 FFMPEGFILES = $(foreach part, $(PARTS), $(part)/*.[chS] libavcodec/*/*.[chS])
738 $(ALLPARTLIBS): $(FFMPEGFILES) libvo/fastmemcpy.h config.h 741 $(ALLPARTLIBS): $(FFMPEGFILES) libvo/fastmemcpy.h config.h
739 $(MAKE) -C $(@D) 742 $(MAKE) -C $(@D)
740 touch $@ 743 touch $@
741 744
742 mplayer$(EXESUF): $(MPLAYER_DEPS) 745 mplayer$(EXESUF): $(MPLAYER_DEPS)
776 779
777 ###### dependency declarations / specific CFLAGS ###### 780 ###### dependency declarations / specific CFLAGS ######
778 781
779 codec-cfg.d: codecs.conf.h 782 codec-cfg.d: codecs.conf.h
780 mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d stream/network.d stream/stream_cddb.d: version.h 783 mencoder.d mplayer.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d stream/network.d stream/stream_cddb.d: version.h
781 DEPS = $(filter-out %.S,$(patsubst %.cpp,%.d,$(patsubst %.c,%.d,$(SRCS_COMMON) $(SRCS_MPLAYER:.m=.d) $(SRCS_MENCODER))))
782 $(DEPS): help_mp.h 784 $(DEPS): help_mp.h
783 785
784 dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE $(LIBDVDCSS_DVDREAD_FLAGS) 786 dvdread/%.o dvdread/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE $(LIBDVDCSS_DVDREAD_FLAGS)
785 libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" 787 libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\"
786 libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE 788 libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE