X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile;h=291197bc2a4859be6637be49ce02e2cb149182ae;hb=0cf3505930913d3584b215f6912de04ff41366e0;hp=3510a1ed59929dc15022d8511bbc41ec82b1d00f;hpb=5e27ec28f0aa263fc6af60ea88677e2c40631920;p=ffmpeg diff --git a/Makefile b/Makefile index 3510a1ed599..291197bc2a4 100644 --- a/Makefile +++ b/Makefile @@ -10,8 +10,8 @@ vpath %.texi $(SRC_PATH) ifndef V Q = @ ECHO = printf "$(1)\t%s\n" $(2) -BRIEF = CC AS YASM AR LD HOSTCC -SILENT = DEPCC YASMDEP RM RANLIB +BRIEF = CC HOSTCC HOSTLD AS YASM AR LD +SILENT = DEPCC DEPHOSTCC DEPAS DEPYASM RANLIB RM MSG = $@ M = @$(call ECHO,$(TAG),$@); $(foreach VAR,$(BRIEF), \ @@ -20,16 +20,20 @@ $(foreach VAR,$(SILENT),$(eval override $(VAR) = @$($(VAR)))) $(eval INSTALL = @$(call ECHO,INSTALL,$$(^:$(SRC_PATH)/%=%)); $(INSTALL)) endif +ALLFFLIBS = avcodec avdevice avfilter avformat avresample avutil swscale + IFLAGS := -I. -I$(SRC_PATH) CPPFLAGS := $(IFLAGS) $(CPPFLAGS) CFLAGS += $(ECFLAGS) -CCFLAGS = $(CFLAGS) -YASMFLAGS += $(IFLAGS) -Pconfig.asm -HOSTCFLAGS += $(IFLAGS) +CCFLAGS = $(CPPFLAGS) $(CFLAGS) +ASFLAGS := $(CPPFLAGS) $(ASFLAGS) +YASMFLAGS += $(IFLAGS:%=%/) -Pconfig.asm +HOSTCCFLAGS = $(IFLAGS) $(HOSTCFLAGS) +LDFLAGS := $(ALLFFLIBS:%=$(LD_PATH)lib%) $(LDFLAGS) define COMPILE - $($(1)DEP) - $($(1)) $(CPPFLAGS) $($(1)FLAGS) $($(1)_DEPFLAGS) -c $($(1)_O) $< + $(call $(1)DEP,$(1)) + $($(1)) $($(1)FLAGS) $($(1)_DEPFLAGS) $($(1)_C) $($(1)_O) $< endef COMPILE_C = $(call COMPILE,CC) @@ -41,51 +45,58 @@ COMPILE_S = $(call COMPILE,AS) %.o: %.S $(COMPILE_S) -%.ho: %.h - $(CC) $(CPPFLAGS) $(CFLAGS) -Wno-unused -c -o $@ -x c $< +%.i: %.c + $(CC) $(CCFLAGS) $(CC_E) $< + +%.h.c: + $(Q)echo '#include "$*.h"' >$@ %.ver: %.v $(Q)sed 's/$$MAJOR/$($(basename $(@F))_VERSION_MAJOR)/' $^ > $@ %.c %.h: TAG = GEN -PROGS-$(CONFIG_FFMPEG) += ffmpeg -PROGS-$(CONFIG_FFPLAY) += ffplay -PROGS-$(CONFIG_FFPROBE) += ffprobe -PROGS-$(CONFIG_FFSERVER) += ffserver +PROGS-$(CONFIG_AVCONV) += avconv +PROGS-$(CONFIG_AVPLAY) += avplay +PROGS-$(CONFIG_AVPROBE) += avprobe +PROGS-$(CONFIG_AVSERVER) += avserver PROGS := $(PROGS-yes:%=%$(EXESUF)) -OBJS = $(PROGS-yes:%=%.o) cmdutils.o -TOOLS = $(addprefix tools/, $(addsuffix $(EXESUF), cws2fws graph2dot lavfi-showfiltfmts pktdumper probetest qt-faststart trasher)) +OBJS = cmdutils.o $(EXEOBJS) +OBJS-avconv = avconv_opt.o avconv_filter.o TESTTOOLS = audiogen videogen rotozoom tiny_psnr base64 -HOSTPROGS := $(TESTTOOLS:%=tests/%) +HOSTPROGS := $(TESTTOOLS:%=tests/%) doc/print_options +TOOLS = qt-faststart trasher +TOOLS-$(CONFIG_ZLIB) += cws2fws -BASENAMES = ffmpeg ffplay ffprobe ffserver +BASENAMES = avconv avplay avprobe avserver ALLPROGS = $(BASENAMES:%=%$(EXESUF)) ALLMANPAGES = $(BASENAMES:%=%.1) -ALLFFLIBS = avcodec avdevice avfilter avformat avutil postproc swscale - FFLIBS-$(CONFIG_AVDEVICE) += avdevice FFLIBS-$(CONFIG_AVFILTER) += avfilter FFLIBS-$(CONFIG_AVFORMAT) += avformat +FFLIBS-$(CONFIG_AVRESAMPLE) += avresample FFLIBS-$(CONFIG_AVCODEC) += avcodec -FFLIBS-$(CONFIG_POSTPROC) += postproc FFLIBS-$(CONFIG_SWSCALE) += swscale FFLIBS := avutil -DATA_FILES := $(wildcard $(SRC_PATH)/ffpresets/*.ffpreset) +DATA_FILES := $(wildcard $(SRC_PATH)/presets/*.avpreset) SKIPHEADERS = cmdutils_common_opts.h include $(SRC_PATH)/common.mak -FF_LDFLAGS := $(FFLDFLAGS) FF_EXTRALIBS := $(FFEXTRALIBS) FF_DEP_LIBS := $(DEP_LIBS) -all: $(FF_DEP_LIBS) $(PROGS) +all: $(PROGS) + +$(TOOLS): %$(EXESUF): %.o $(EXEOBJS) + $(LD) $(LDFLAGS) $(LD_O) $^ $(ELIBS) + +tools/cws2fws$(EXESUF): ELIBS = $(ZLIB) config.h: .config .config: $(wildcard $(FFLIBS:%=$(SRC_PATH)/lib%/all*.c)) @@ -93,9 +104,12 @@ config.h: .config @-printf '\nWARNING: $(?F) newer than config.h, rerun configure\n\n' @-tput sgr0 2>/dev/null -SUBDIR_VARS := OBJS FFLIBS CLEANFILES DIRS TESTPROGS EXAMPLES SKIPHEADERS \ - ALTIVEC-OBJS MMX-OBJS NEON-OBJS X86-OBJS YASM-OBJS-FFT YASM-OBJS \ - HOSTPROGS BUILT_HEADERS TESTOBJS ARCH_HEADERS ARMV6-OBJS +SUBDIR_VARS := CLEANFILES EXAMPLES FFLIBS HOSTPROGS TESTPROGS TOOLS \ + HEADERS ARCH_HEADERS BUILT_HEADERS SKIPHEADERS \ + ARMV5TE-OBJS ARMV6-OBJS VFP-OBJS NEON-OBJS \ + ALTIVEC-OBJS VIS-OBJS \ + MMX-OBJS YASM-OBJS \ + OBJS HOSTOBJS TESTOBJS define RESET $(1) := @@ -106,24 +120,25 @@ define DOSUBDIR $(foreach V,$(SUBDIR_VARS),$(eval $(call RESET,$(V)))) SUBDIR := $(1)/ include $(SRC_PATH)/$(1)/Makefile +-include $(SRC_PATH)/$(1)/$(ARCH)/Makefile +include $(SRC_PATH)/library.mak endef $(foreach D,$(FFLIBS),$(eval $(call DOSUBDIR,lib$(D)))) -ffplay.o: CFLAGS += $(SDL_CFLAGS) -ffplay$(EXESUF): FF_EXTRALIBS += $(SDL_LIBS) -ffserver$(EXESUF): FF_LDFLAGS += $(FFSERVERLDFLAGS) - -$(PROGS): %$(EXESUF): %.o cmdutils.o $(FF_DEP_LIBS) - $(LD) $(FF_LDFLAGS) -o $@ $< cmdutils.o $(FF_EXTRALIBS) - -alltools: $(TOOLS) +define DOPROG +OBJS-$(1) += $(1).o cmdutils.o $(EXEOBJS) +$(1)$(EXESUF): $$(OBJS-$(1)) +$$(OBJS-$(1)): CFLAGS += $(CFLAGS-$(1)) +$(1)$(EXESUF): LDFLAGS += $(LDFLAGS-$(1)) +$(1)$(EXESUF): FF_EXTRALIBS += $(LIBS-$(1)) +-include $$(OBJS-$(1):.o=.d) +endef -tools/%$(EXESUF): tools/%.o - $(LD) $(FF_LDFLAGS) -o $@ $< $(FF_EXTRALIBS) +$(foreach P,$(PROGS-yes),$(eval $(call DOPROG,$(P)))) -tools/%.o: tools/%.c | tools - $(CC) $(CPPFLAGS) $(CFLAGS) -c $(CC_O) $< +$(PROGS): %$(EXESUF): %.o $(FF_DEP_LIBS) + $(LD) $(LDFLAGS) $(LD_O) $(OBJS-$*) $(FF_EXTRALIBS) OBJDIRS += tools @@ -172,7 +187,6 @@ uninstall-data: clean:: $(RM) $(ALLPROGS) $(RM) $(CLEANSUFFIXES) - $(RM) $(TOOLS) $(RM) $(CLEANSUFFIXES:%=tools/%) distclean:: @@ -182,7 +196,7 @@ distclean:: config: $(SRC_PATH)/configure $(value LIBAV_CONFIGURATION) -check: test checkheaders +check: all alltools checkheaders examples testprogs fate include $(SRC_PATH)/doc/Makefile include $(SRC_PATH)/tests/Makefile @@ -198,5 +212,5 @@ $(sort $(OBJDIRS)): # so this saves some time on slow systems. .SUFFIXES: -.PHONY: all alltools *clean check config examples install* +.PHONY: all all-yes alltools check *clean config examples install* .PHONY: testprogs uninstall*